fix bug

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MediicinecabinetInventory.java

@@ -29,7 +29,7 @@ public class MediicinecabinetInventory extends UuidIdentityEntityWithOperator im
    private String state;
    /**
     * num
     * num,预警数量
     */
    private String num;

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

@@ -762,7 +762,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    medicineShipmentLog.getDeviceId(),              //equNum
                    medicineShipmentLog.getLayerNo(),
                    medicineShipmentLog.getWayerNo().split(",")[0]);
            inventory.setQty(String.valueOf((Integer.parseInt(inventory.getQty()) - 1)<0 ? 0 :(Integer.parseInt(inventory.getQty()) - 1)));
//            inventory.setQty(String.valueOf((Integer.parseInt(inventory.getQty()) - 1)<0 ? 0 :(Integer.parseInt(inventory.getQty()) - 1)));
            inventory.setQty((Integer.parseInt(inventory.getQty()) - 1<0 ? "0" :String.valueOf((Integer.parseInt(inventory.getQty()) - 1))));
            if (Integer.parseInt(inventory.getQty()) < Integer.parseInt(inventory.getNum())) {
                Mediicinedevice mediicinedevice = deviceDao.findOne(inventory.getIdDevice());
                //0缺货，1不缺货

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

@@ -140,6 +140,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                inventory.setEquNum(deviceId);
                //1标识单列货道，21表示合并货道主货道，20表示合并货道的次货道
                inventory.setState("1");
                inventory.setNum("0");
                inventory.setMerge(String.valueOf(i1+1));
                inventory.setCargoCapacity(mediicinedevice.getCargoCapacity());
                //默认下架