Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ChangeServiceImpl.java

@@ -581,6 +581,7 @@ public class ChangeServiceImpl implements ChangeService {
             String pcsn = jo.getString("pcsn");
 
             JSONObject old_sub = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("container_name = '" + pcsn + "' AND status = '2'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(old_sub)) throw new BadRequestException("子卷包装关系不存在或不在库内!");
             old_sub.put("change_type_scode", "02");
             old_sub.put("change_order_id", jo_mst.getString("changeinv_id"));
             old_sub.put("change_order_code", jo_mst.getString("bill_code"));