rev:贴标增加开关

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -677,10 +677,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     if (ObjectUtil.isEmpty(jsonCust)) {
                         throw new BadRequestException("客户不存在请检查!");
                     }
-
                     JSONObject data = new JSONObject();
                     data.put("is_auto_table", jsonCust.getString("is_auto_table"));
 
+                    //判断系统参数是否贴标
+                    String is_labeling = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_labeling").getValue();
+                    if (is_labeling.equals("0")){
+                        //更新实际重量
+                        HashMap<String, Object> map = new HashMap<>();
+                        map.put("real_weight",weight);
+                        WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + vehicle_code + "'");
+                        data.put("is_auto_table", "0");
+                        result.put("data", data);
+                        return result;
+                    }
+
                     // 判断是否贴标
                     if (!StrUtil.equals(jsonCust.getString("is_auto_table"), "1")) {
                         result.put("data", data);