浏览代码

出货,也进行,货道排序

wangzhinan 3 年之前
父节点
当前提交
02b2965849

+ 12 - 4
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@ -3189,10 +3189,18 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    tempInventory = inventoryMap;
                    tempInventory = inventoryMap;
                }
                }
                if ("20".equals(inventoryMap.get("state").toString())) {
                if ("20".equals(inventoryMap.get("state").toString())) {
                    inventoryMap.put("cargoCapacity", tempInventory.get("cargoCapacity").toString());
                    inventoryMap.put("price", tempInventory.get("price").toString());
                    inventoryMap.put("drugName", tempInventory.get("drugName").toString());
                    inventoryMap.put("qty", tempInventory.get("qty").toString());
                    if (tempInventory.get("cargoCapacity") != null && !StringUtils.isEmpty(tempInventory.get("cargoCapacity").toString())) {
                        inventoryMap.put("cargoCapacity", tempInventory.get("cargoCapacity").toString());
                    }
                    if (tempInventory.get("price") != null && !StringUtils.isEmpty(tempInventory.get("price").toString())) {
                        inventoryMap.put("price", tempInventory.get("price").toString());
                    }
                    if (tempInventory.get("drugName") != null && !StringUtils.isEmpty(tempInventory.get("drugName").toString())) {
                        inventoryMap.put("drugName", tempInventory.get("drugName").toString());
                    }
                    if (tempInventory.get("qty") != null && !StringUtils.isEmpty(tempInventory.get("qty").toString())) {
                        inventoryMap.put("qty", tempInventory.get("qty").toString());
                    }
                }
                }
                if (id.equalsIgnoreCase(inventoryMap.get("layerNo").toString())){
                if (id.equalsIgnoreCase(inventoryMap.get("layerNo").toString())){
                    jsonArray.add(inventoryMap);
                    jsonArray.add(inventoryMap);