From 0d4191171336625b7974252020b9c60270a7099d Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 22 Apr 2022 16:40:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/purchasingManagement/MaterialSplitMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml index ba326a7..c2e45f3 100644 --- a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml +++ b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml @@ -156,7 +156,7 @@ SourceType,OriginalRollNo,OrderRef5,rolltype,rolltype_db,firstlevelrollno,remark,parttype_flag, CustomerID,FGPartNo,Ref_SupplierID,Ref_PartDesc,warehouseid) values (#{site},#{rollNo},#{rollQty},#{partNo},#{supplierID},#{orderRef1},#{orderRef2},#{orderRef3},#{orderRef4}, - #{suppDeliveryNote},#{rollDate},#{createdDate},#{createdBy},#{statusDb},#{status},#{suppRollNo},#{rollSeqNo},#{suppRollNoFlag}, + #{suppDeliveryNote},#{rollDate},#{createdDate},#{createdBy},#{statusDb},#{status},'',#{rollSeqNo},#{suppRollNoFlag}, #{sourceType},#{originalRollNo},#{orderRef5},#{rolltype},#{rolltypeDb},#{firstlevelrollno},#{remark},#{parttypeFlag}, #{customerID},#{fGPartNo},#{refSupplierID},#{refPartDesc},#{warehouseid}) From 22daa1b393f435969926b2f57c9b9734cd38d215 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Fri, 22 Apr 2022 16:59:08 +0800 Subject: [PATCH 2/3] fifo 2022-04-22 sxm --- src/main/java/com/gaotao/modules/pda/dao/RollDao.java | 9 +++++++++ .../com/gaotao/modules/pda/dao/impl/RollDaoImpl.java | 9 +++++++++ .../gaotao/modules/pda/service/impl/DumpServiceImpl.java | 4 ++++ .../resources/static/pda/js/receipt/receipt_order.js | 1 + 4 files changed, 23 insertions(+) diff --git a/src/main/java/com/gaotao/modules/pda/dao/RollDao.java b/src/main/java/com/gaotao/modules/pda/dao/RollDao.java index 700e9fb..8a3675e 100644 --- a/src/main/java/com/gaotao/modules/pda/dao/RollDao.java +++ b/src/main/java/com/gaotao/modules/pda/dao/RollDao.java @@ -116,4 +116,13 @@ public interface RollDao { * @return [com.gaotao.modules.pda.entity.RollInfo] **/ List getRollInfoByPartNo(RollInfo rollInfo); + + /** + * @Author sxm + * @Description 修改卷的状态 + * @Date 2022/4/22 16:55 + * @Param + * @return + **/ + void updateRollStatus(String rollNo, String status); } diff --git a/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java b/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java index 1f07105..3afdf98 100644 --- a/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java +++ b/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java @@ -215,4 +215,13 @@ public class RollDaoImpl implements RollDao { return parameterJdbcTemplate.query(sql.toString(), paramMap, new BeanPropertyRowMapper<>(RollInfo.class)); } + + @Override + public void updateRollStatus(String rollNo, String status) { + Map params = new HashMap<>(); + params.put("rollNo", rollNo); + params.put("status", status); + String sql = "update C_RollInfo set Status_DB = :status Where RollNo=:rollNo"; + parameterJdbcTemplate.update(sql, params); + } } diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java index 33ef938..8897788 100644 --- a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java @@ -224,6 +224,8 @@ public class DumpServiceImpl implements DumpService { double nums = Double.parseDouble(currentRollSap.get("nums").toString())+rollQty; currentRollSap.put("nums", nums); } + // 修改卷的状态 + rollDao.updateRollStatus(rollNo,"D"); responseData.setCode("0"); }else{ responseData.setCode("1"); @@ -303,6 +305,8 @@ public class DumpServiceImpl implements DumpService { }else{ dumpToSap.remove(site+"-"+partNo); } + // 修改卷的状态 + rollDao.updateRollStatus(rollNo,"I"); responseData.setCode("0"); return responseData; } diff --git a/src/main/resources/static/pda/js/receipt/receipt_order.js b/src/main/resources/static/pda/js/receipt/receipt_order.js index f57cb05..8abd7b3 100644 --- a/src/main/resources/static/pda/js/receipt/receipt_order.js +++ b/src/main/resources/static/pda/js/receipt/receipt_order.js @@ -51,6 +51,7 @@ function scanRollNo(rollNo){ } }, error : function(data) { + } }); } From ee6808673eb6a770f88edbb957ba316d96f043d1 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Fri, 22 Apr 2022 17:19:33 +0800 Subject: [PATCH 3/3] fifo 2022-04-22 sxm --- .../gaotao/modules/pda/service/impl/DumpServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java index 8897788..eeb558e 100644 --- a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java @@ -523,6 +523,7 @@ public class DumpServiceImpl implements DumpService { } @Override + @Transactional public ResponseData goBackHome(HttpSession session) { ResponseData responseData = new ResponseData(); //1.恢复扫码标记 @@ -545,6 +546,10 @@ public class DumpServiceImpl implements DumpService { Map dumpRollNos = (Map) session.getAttribute("dumpRollNos"); if(null!=dumpRollNos){ session.removeAttribute("dumpRollNos"); + // 还原扫描卷的状态 + for (String key:dumpRollNos.keySet()){ + rollDao.updateRollStatus(key,"I"); + } } //7.移除卷号统计map Map dumpRollCounts = (Map) session.getAttribute("dumpRollCounts"); @@ -563,6 +568,8 @@ public class DumpServiceImpl implements DumpService { } //10.移除提交标记 session.removeAttribute("dump_submit_flag"); + + responseData.setCode("0"); return responseData; }