xinzeng

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

@@ -616,6 +616,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    }
    /**
     * 出货后，更新订单出货单状态
     * @param shipmentLogId
     * @param status
     * @return
     */
    public JSONObject updateOrderOutStatus(String shipmentLogId, String status) {
        JSONObject result = new JSONObject();
        if (shipmentLogId == null || StringUtils.isEmpty(shipmentLogId)) {

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

@@ -1502,7 +1502,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory t\n" +
                    "WHERE\n" +
                    "\tt.id_device = '" + stringObjectMap.get("equNum") +"'\n" +
                    "\tconcat(t.id_device, t.equ_num) like '%" + stringObjectMap.get("equNum") +"%'\n" +
                    "AND t.shelf_status = 1";
            //库存
            Integer qty = jdbcTemplate.queryForObject( tempSql, Integer.class);
@@ -1513,7 +1513,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory t\n" +
                    "WHERE\n" +
                    "\tt.id_device = ''\n" +
                    "\tconcat(t.id_device, t.equ_num) like '%" + stringObjectMap.get("equNum") +"%'\n" +
                    "AND t.shelf_status = 0";
            stringObjectMap.put("xiajiaQty", jdbcTemplate.queryForObject( tempSql, Integer.class));
            Date buhuoDate = jdbcTemplate.queryForObject( "SELECT\n" +