From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |  300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 277 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index d7b397b..0a50dce 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -3,16 +3,16 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
+import com.core.common.*;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.WorkLogHandler;
+import com.zy.asrs.utils.MatUtils;
 import com.zy.common.constant.MesConstant;
 import com.zy.common.entity.Parameter;
 import com.zy.common.model.DetlDto;
@@ -56,6 +56,16 @@
     private OpenService openService;
     @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private WorkLogHandler workLogHandler;
+    @Autowired
+    private AdjDetlService adjDetlService;
+    @Autowired
+    private CheckRecordService checkRecordService;
+    @Autowired
+    private LocDetlService locDetlService;
 
     @Override
     @Transactional
@@ -64,11 +74,35 @@
             throw new CoolException(BaseRes.PARAM);
         }
         // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+//                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+//            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+//        }
         if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
-            throw new CoolException(param.getBarcode() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+                eq("zpallet", param.getBarcode())) > 0) {
+            throw new CoolException(param.getBarcode() + "缁勬墭鏁版嵁宸插瓨鍦�");
         }
+
+        // todo: 涓嶄笅绾块噸鏂板叆搴�
+        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+        if (wrkMast != null && wrkMast.getWrkSts() == 18) {
+            ReturnT<String> start = workLogHandler.start(wrkMast);
+            if (!start.isSuccess()) {
+                log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo());
+            }
+        }
+
+        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+//        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())
+//                                            .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )"));
+        if (wrkMast != null && wrkMast.getWrkSts()==18) countWrk = 0;
+        if (countLoc > 0 || countWrk > 0) {
+            throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+        }
+
         Date now = new Date();
+        Integer matType = 0;
 
         // 鏃犲崟缁勬墭
         if (Cools.isEmpty(param.getOrderNo())) {
@@ -76,7 +110,18 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+//                elem.setBatch("");
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), elem.getMemo(), elem.getCstmr(),elem.getOwner());
+
+                if (Cools.isEmpty(detlDto.getBatch())){
+                    String batch = DateUtils.convert(new Date(),DateUtils.yyyyMMdd);
+                    detlDto.setBatch(batch);
+                }
+
+                if (Cools.isEmpty(detlDto.getOwner())){
+                    detlDto.setOwner(1L);
+                }
+
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -94,6 +139,7 @@
                 }
                 WaitPakin waitPakin = new WaitPakin();
                 waitPakin.sync(mat);
+//                waitPakin.setBatch("");
                 waitPakin.setBatch(detlDto.getBatch());
                 waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
                 waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
@@ -103,6 +149,21 @@
                 waitPakin.setAppeTime(now);
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
+                waitPakin.setOwner(detlDto.getOwner());
+                waitPakin.setMemo(detlDto.getMemo());
+                waitPakin.setFrozen(param.getFrozen()); // 鏄惁鍐荤粨
+                waitPakin.setManu(detlDto.getCstmr());
+                waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+                waitPakin.setMatTypeIn(param.getMatTypeIn());//寮哄埗鐗╂枡绫诲瀷
+                if (Cools.isEmpty(mat.getMatType())){
+                    throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+                }else {
+                    if (matType == 0){
+                        matType = mat.getMatType();
+                    }else if (!matType.equals(mat.getMatType())){
+                        throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+                    }
+                }
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
@@ -116,7 +177,7 @@
             // 鐢熸垚鍏ュ簱閫氱煡妗�
             List<DetlDto> detlDtos = new ArrayList<>();
             param.getCombMats().forEach(elem -> {
-
+                //elem.setBatch("");
                 // 璁㈠崟鏄庣粏鏁伴噺鏍¢獙
                 OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                 if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -127,7 +188,12 @@
                     throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
                 }
 
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getOwner());
+
+                if (Cools.isEmpty(detlDto.getOwner())){
+                    detlDto.setOwner(1L);
+                }
+
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -144,7 +210,7 @@
                 WaitPakin waitPakin = new WaitPakin();
                 waitPakin.sync(mat);
                 waitPakin.setOrderNo(order.getOrderNo());   // 鍗曟嵁缂栧彿
-                waitPakin.setBatch(detlDto.getBatch());     // 鎵瑰彿
+                //waitPakin.setBatch("");     // 搴忓垪鐮�
                 waitPakin.setZpallet(param.getBarcode());   // 鎵樼洏鐮�
                 waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
                 waitPakin.setAnfme(detlDto.getAnfme());  // 鏁伴噺
@@ -153,6 +219,18 @@
                 waitPakin.setAppeTime(now);
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
+                waitPakin.setOwner(detlDto.getOwner());
+                waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
+                waitPakin.setMatTypeIn(param.getMatTypeIn()); //寮哄埗鐗╂枡绫诲瀷
+//                if (Cools.isEmpty(mat.getMatType())){
+//                    throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+//                }else {
+//                    if (matType == 0){
+//                        matType = mat.getMatType();
+//                    }else if (matType!=mat.getMatType()){
+//                        throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+//                    }
+//                }
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
@@ -160,6 +238,81 @@
             orderService.updateSettle(order.getId(), 2L, userId);
         }
 
+    }
+    @Override
+    @Transactional
+    public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+        if (Cools.isEmpty(wrkMast)){
+            throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏃犳湁鏁堝伐浣滄。");
+        }else if (wrkMast.getIoType()!=107){
+            throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。闈炵洏鐐逛换鍔�");
+        }else if (wrkMast.getWrkSts()!=17.0){
+            throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鎵�灞炲伐浣滄。宸ヤ綔鐘舵�佷笉鏄嚭搴撳畬鎴�");
+        }else { }
+
+        List<WrkDetl> wrkDetls = param.getWrkDetls();
+        String recordRecordLog="鎵樼洏鐮�"+param.getBarcode()+"鐩樼偣璁板綍锛�";
+        AdjDetl adjDetl=new AdjDetl();
+        adjDetl.setAppeTime(new Date());
+        adjDetl.setAppeUser(userId);
+        adjDetl.setModiTime(new Date());
+        adjDetl.setModiUser(userId);
+        adjDetl.setLocNo(wrkMast.getSourceLocNo());
+        CheckRecord checkRecord=new CheckRecord();
+        checkRecord.setLocNo(wrkMast.getSourceLocNo());
+        checkRecord.setBarcode(param.getBarcode());
+        checkRecord.setCreateTime(new Date());
+        for (WrkDetl wrkDetl:wrkDetls){
+            WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+                    .eq("wrk_no", wrkMast.getWrkNo())
+                    .eq("matnr",wrkDetl.getMatnr())
+//                    .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
+            );
+//            LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+//                            .eq("loc_no", wrkMast.getLocNo())
+//                            .eq("matnr",wrkDetl.getMatnr())
+//                            .eq("batch",wrkDetl.getBatch())
+//            );
+
+            adjDetl.setMatnr(wrkDetl.getMatnr());
+            adjDetl.setBatch(wrkDetl.getBatch());
+            adjDetl.setAdjQty(wrkDetl.getAnfme());
+
+            checkRecord.setMatnr(wrkDetl.getMatnr());
+            checkRecord.setMaktx(wrkDetl.getMaktx());
+            checkRecord.setSpecs(wrkDetl.getSpecs());
+            checkRecord.setBatch(wrkDetl.getBatch());
+            checkRecord.setConfirmQty(wrkDetl.getAnfme());
+            if (Cools.isEmpty(wrkDetlOld)){
+                wrkDetl.setWrkNo(wrkMast.getWrkNo());
+                wrkDetl.setZpallet(wrkMast.getBarcode());
+                wrkDetlService.insert(wrkDetl);
+                recordRecordLog=recordRecordLog+"\n"+"鏂板涓�鏉℃槑缁�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鏁伴噺锛�"+wrkDetl.getAnfme();
+                adjDetl.setOriQty(0.0);
+                adjDetlService.insert(adjDetl);
+                checkRecord.setAnfme(0.0);
+                if (!re) {
+                    checkRecordService.insert(checkRecord);
+                }
+            }else if (wrkDetlOld.getAnfme()!=wrkDetl.getAnfme()){
+                wrkDetlService.updateAnfme(wrkDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
+                recordRecordLog=recordRecordLog+"\n"+"鏇存柊涓�鏉℃槑缁�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鍘熸暟閲忥細"+wrkDetlOld.getAnfme()+"\t鏂版暟閲忥細"+wrkDetl.getAnfme();
+                adjDetl.setOriQty(wrkDetlOld.getAnfme());
+                adjDetlService.insert(adjDetl);
+
+                checkRecord.setAnfme(wrkDetlOld.getAnfme());
+                if (!re) {
+                    checkRecordService.insert(checkRecord);
+                }
+            }else if (wrkDetlOld.getAnfme()==wrkDetl.getAnfme()){
+                recordRecordLog=recordRecordLog+"\n"+"涓�鏉℃槑缁嗕繚鎸佷笉鍙�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鏁伴噺锛�"+wrkDetlOld.getAnfme();
+                continue;
+            }else {
+                throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏈煡寮傚父锛岃鑱旂郴绠$悊鍛�");
+            }
+        }
+        log.info(recordRecordLog);
     }
 
     @Override
@@ -196,7 +349,7 @@
                         // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
                         // 淇敼鏄庣粏
                         if (!wrkDetlService.updateAnfme(wrkDetl1.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
-                            throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
+                            throw new CoolException(wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "搴忓垪鐮佷慨鏀规暟閲忓け璐�");
                         }
                     }
                     iterator.remove();
@@ -209,7 +362,7 @@
         for (WrkDetl wrkDetl : wrkDetls) {
             // todo 鐩樼偣璁板綍銆佷繚瀛樿皟鏁磋褰�
             if (!wrkDetlService.updateAnfme(-1.0D, wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
-                throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+                throw new CoolException("鍒犻櫎" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "搴忓垪鐮佷换鍔℃槑缁嗗け璐�");
             }
         }
 
@@ -226,7 +379,7 @@
             wrkDetl.setAppeTime(now);
             wrkDetl.setAppeUser(userId);
             if (!wrkDetlService.insert(wrkDetl)) {
-                throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
+                throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "搴忓垪鐮佷换鍔℃槑缁嗗け璐�");
             }
         }
 
@@ -271,7 +424,10 @@
                         throw new CoolException(elem.getMatnr() + "鏉$爜宸蹭笅绾匡紝璇锋鏌ワ紒");
                     }
                 }
-                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+                Mat analyse = MatUtils.analyseMat(elem.getMatnr());
+                // 鏉$爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
+                DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
+//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
                 if (DetlDto.has(detlDtos, detlDto)) {
                     DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                     assert one != null;
@@ -284,14 +440,18 @@
             if (packDown) {
                 MesCombParam mesCombParam = new MesCombParam();
                 mesCombParam.setZpallet(param.getBarcode());
-                mesCombParam.setCombTime(DateUtils.convert(now));
+                mesCombParam.setPakinTime(DateUtils.convert(now));
                 mesCombParam.setLgort("5008");
+                mesCombParam.setPlantCode("5000");
+                mesCombParam.setFromCode("5012-20");
+                mesCombParam.setStationCode("JJQ-PFZPDB-XX");
                 for (DetlDto detlDto : detlDtos) {
-                    mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getMatnr(), detlDto.getAnfme()));
+                    mesCombParam.getList().add(new MesCombParam.Detl(detlDto.getOrderNo(), detlDto.getAnfme()));
                 }
-                String response;
+                String response = "";
+                boolean success = false;
                 try {
-                    response  = new HttpHandler.Builder()
+                    response = new HttpHandler.Builder()
                             .setUri(MesConstant.URL)
                             .setPath(MesConstant.PACK_DOWN_URL)
                             .setJson(JSON.toJSONString(mesCombParam))
@@ -299,8 +459,8 @@
                             .doPost();
                     JSONObject jsonObject = JSON.parseObject(response);
                     if (jsonObject.getInteger("code").equals(200)) {
-                        log.info("璇锋眰鎺ュ彛鎴愬姛锛侊紒锛�");
-                    } else  if (jsonObject.getInteger("code").equals(500)) {
+                        success = true;
+                    } else if (jsonObject.getInteger("code").equals(500)) {
                         log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(mesCombParam), response);
                         throw new CoolException(jsonObject.getString("msg"));
                     } else {
@@ -309,8 +469,20 @@
                     }
                 } catch (Exception e) {
                     log.error("fail", e);
-                    e.printStackTrace();
-                    throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+                    throw new CoolException(e.getMessage());
+                } finally {
+                    try {
+                        // 淇濆瓨鎺ュ彛鏃ュ織
+                        apiLogService.save(
+                                "鎵撳寘涓嬬嚎甯墭涓婃姤",
+                                MesConstant.URL + MesConstant.PACK_DOWN_URL,
+                                null,
+                                "127.0.0.1",
+                                JSON.toJSONString(mesCombParam),
+                                response,
+                                success
+                        );
+                    } catch (Exception e) { log.error("", e); }
                 }
 
             }
@@ -362,11 +534,12 @@
                 waitPakin.setAppeTime(now);
                 waitPakin.setModiUser(userId);
                 waitPakin.setModiTime(now);
+                waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
                 if (!waitPakinService.insert(waitPakin)) {
                     throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
                 }
                 // 淇敼鎵撳寘鏁版嵁鐘舵��
-                Pack pack = packService.selectByBarcode(detlDto.getMatnr());
+                Pack pack = packService.selectByBarcode(detlDto.getOrderNo());
                 pack.setSettle(2L);
                 pack.setUpdateTime(now);
                 pack.setUpdateBy(userId);
@@ -378,4 +551,85 @@
         }
     }
 
+    @Override
+    @Transactional
+    public void pikingToFull(String barcode) {
+        wrkMastService.selectByBarcode(barcode);
+    }
+
+    @Override
+    @Transactional
+    public List<WrkDetl> pikingToFull2(Integer wrkNo) {
+        List<WrkDetl> wrkDetlsNew= new ArrayList<WrkDetl>();
+        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
+        for (WrkDetl wrkDetl:wrkDetls){
+            String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
+            if (!Cools.isEmpty(orderNos) && orderNos.length!=0) {
+                Double anfme = wrkDetl.getAnfme();
+                for (String orderNo : orderNos) {
+                    OrderDetl orderDetl = orderDetlService.selectItem(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch());
+                    if (orderDetl == null) {
+                        orderDetl = orderDetlService.selectItem(orderNo, wrkDetl.getMatnr(), null);
+                        if (orderDetl == null) {
+                            log.error("ww");
+                            return wrkDetlsNew;
+                        }
+                    }
+                    if (orderDetl.getAnfme() <= anfme) {
+                        WrkDetl wrkDetl1 = new WrkDetl();
+                        wrkDetl1.sync(wrkDetl);
+                        wrkDetl1.setOrderNo(orderNo);
+                        wrkDetl1.setAnfme(anfme);
+                        wrkDetlsNew.add(wrkDetl1);
+                        anfme = anfme - orderDetl.getAnfme();
+                    } else {
+                        WrkDetl wrkDetl1 = new WrkDetl();
+                        wrkDetl1.sync(wrkDetl);
+                        wrkDetl1.setOrderNo(orderNo);
+                        wrkDetl1.setAnfme(anfme);
+                        wrkDetlsNew.add(wrkDetl1);
+                    }
+                }
+            }else {
+                wrkDetlsNew.add(wrkDetl);
+            }
+        }
+        return wrkDetlsNew;
+    }
+
+    private static String[] GetOrderNo(String orderNo) {
+        String[] s3 = orderNo.split("\"");
+        String[] s = new String[(s3.length - 1) / 6];
+        if (!Cools.isEmpty(s3)){
+            int i = 0;
+            int j = 0;
+            for (String ss : s3) {
+                if (ss.equals("orderNo")) {
+                    s[i] = s3[j + 2];
+                    i++;
+                }
+                j++;
+            }
+        }else {
+            s=null;
+        }
+        return s;
+    }
+
+    private String[] GetAnfme(String orderNo) {
+        String[] s3 = orderNo.split("\"");
+        String[] s = new String[(s3.length - 1) / 6];
+        int i = 0;
+        int j = 0;
+        for (String ss : s3) {
+            if (ss.equals("anfme")) {
+                String[] s4 = s3[j + 1].split(":");
+                String[] s5 = s4[1].split("\\.");
+                s[i] = s5[0];
+                i++;
+            }
+            j++;
+        }
+        return s;
+    }
 }

--
Gitblit v1.9.1