Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineStockUpService.java

@@ -301,7 +301,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            }
        }
        String sql = "SELECT\n" +
                "t.bu.name AS replenishErName,\n" +
                "bu.name AS replenishErName,\n" +
                "t.id AS id,\n" +
                "t.community AS community,\n" +
                "t.doc_time AS docTime,\n" +

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

@@ -3189,10 +3189,20 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    tempInventory = inventoryMap;
                }
                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 != null) {
                        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())){
                    jsonArray.add(inventoryMap);