Merge remote-tracking branch 'origin/master'

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_weigh_conveyor/SiemensWeightConveyorDeviceDriver.java

@@ -839,6 +839,7 @@ public class SiemensWeightConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 }
                 //创建指令后修改任务状态
                 taskdto.setTask_status("1");
+                taskdto.setWeight(String.valueOf(this.weight));
                 taskserver.update(taskdto);
                 requireSucess = true;
                 String next_addr = nextdevice.getExtraValue().get("address").toString();

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -230,6 +230,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
         LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type"));
         wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("region")), Device::getRegion, whereJson.get("region"));
+        wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("is_config")), Device::getIs_config, whereJson.get("is_config"));
         wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry")));
         wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time);
         wrapper.orderByDesc(Device::getCreate_time);
@@ -926,6 +927,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
         String vehicle_code = form.getString("vehicle_code");
         String islock = form.getString("islock");
         String requireSucess = form.getString("requireSucess");
+        String requireActionSucess = form.getString("requireActionSucess");
         String fullrequireSucess = form.getString("fullrequireSucess");
         if (device_code.indexOf(".") != -1) {
             device_code = device_code.substring(0, device_code.indexOf("."));

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -1125,11 +1125,11 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
             action = LangProcess.msg("universal_releasing_completed");
         }
         if (error == 0 && iserror) {
-            this.setMessage("universal_message11");
+            this.setMessage("信号连接异常!");
         }
-        String requireActionSucess = "指令" + LangProcess.msg("universal_actionMessage4");
+        String requireActionSucess = LangProcess.msg("universal_directives") + ":" + LangProcess.msg("universal_actionMessage4");
         if(this.requireActionSucess){
-            requireActionSucess = "指令" + LangProcess.msg("universal_actionMessage5");
+            requireActionSucess = LangProcess.msg("universal_directives") + ":"  + LangProcess.msg("universal_actionMessage5");
         }
         map.put("device_name", this.getDevice().getDevice_name());
         map.put("mode", mode);
@@ -1156,11 +1156,17 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
     @Override
     public void setDeviceStatus(JSONObject data) {
         String requestSucess = data.getString("requireSucess");
+        String requireActionSucess = data.getString("requireActionSucess");
         if (StrUtil.equals(requestSucess, "0")) {
             this.requireSucess = false;
         } else if (StrUtil.equals(requestSucess, "1")) {
             this.requireSucess = true;
         }
+        if (StrUtil.equals(requireActionSucess, "0")) {
+            this.requireActionSucess = false;
+        } else if (StrUtil.equals(requireActionSucess, "1")) {
+            this.requireActionSucess = true;
+        }
     }
 
     public void writing(String param, String value) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java

@@ -408,7 +408,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                 Device next_device = deviceAppService.findDeviceByCode(nextDeviceCode);
                 if (next_device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
                     plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) next_device.getDeviceDriver();
-                    if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2&&plugPullDeviceSiteDeviceDriver.getAction() != 3)
+                    if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2 || plugPullDeviceSiteDeviceDriver.getAction() != 3)
                         notCreateInstMessage = "universal_notCreateInstMessage9";
                         return false;
                 }
@@ -701,9 +701,9 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
         map.put("driver_type", "siemens_conveyor");
         map.put("is_click", true);
         map.put("message", message);
-        map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
         map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
         map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
+        map.put("error", ErrorUtil.getDictDetail("bqhj_error_type", String.valueOf(this.getError())));
         /*jo.put("x", xPosition);
         jo.put("y", yPosition);*/
         JSONObject jo = new JSONObject(map);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java

@@ -627,7 +627,7 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
         map.put("move", move);
         map.put("action", action);
         map.put("isOnline", this.getIsonline());
-        map.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
+        map.put("error", ErrorUtil.getDictDetail("bhhj_error_type", String.valueOf(this.getError())));
         map.put("isError", this.getIserror());
         map.put("message", message);
         map.put("feedMessage", feedMessage);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -95,6 +95,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
         try {
             MDC.put(log_file_type, log_type);
             log.info("crateTask-----输入参数{}", param);
+            LuceneLogDto luceneLogDto = new LuceneLogDto(4, param, "acs接收lms任务");
+            luceneLogService.interfaceExecuteLog(luceneLogDto);
             JSONArray datas = JSONArray.parseArray(param);
             CreateTaskResponse response = new CreateTaskResponse();
 //            ParamService paramService = SpringContextHolder.getBean(ParamService.class);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java

@@ -41,7 +41,7 @@ public class ErrorUtil {
                 String en_label = dictDetailDto.getEn_label();
                 String in_label = dictDetailDto.getIn_label();
                 String zh_label = dictDetailDto.getZh_label();
-                if (StrUtil.equals(value, error_code)) {
+                if (StrUtil.equals(value, error_code) && ObjectUtil.isNotEmpty(language)) {
                     if (language.contains("zh")){
                         detail = zh_label;
                         break;
@@ -54,7 +54,10 @@ public class ErrorUtil {
                         detail = en_label;
                         break;
                     }
-
+                    if(StrUtil.isEmpty(language)){
+                        detail = en_label;
+                        break;
+                    }
                 }
             }
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/InitLocaleResolver.java

@@ -19,7 +19,6 @@ public class InitLocaleResolver implements LocaleResolver {
         if (StringUtils.isNotEmpty(header)){
             String lang = Language_Country.get(header);
             language = lang;
-            System.out.println("lang的值为："+lang);
             if (StringUtils.isNotEmpty(lang)){
                 String[] l = lang.split("-");
                 //印尼的ISO标准国家代码为id-ID

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java

@@ -153,6 +153,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
             dic.setPara1(dict.getPara1());
             dic.setPara2(dict.getPara2());
             dic.setPara3(dict.getPara3());
+            dic.setZh_label(dict.getZh_label());
+            dic.setEn_label(dict.getEn_label());
+            dic.setIn_label(dict.getIn_label());
             sysDictMapper.updateById(dic);
             return;
         }

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties

@@ -63,6 +63,7 @@ universal_actionMessage2=\u5141\u8BB8\u53D6\u653E
 universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00
 universal_actionMessage4=\u8BF7\u6C42\u52A8\u4F5C\u5DF2\u590D\u4F4D
 universal_actionMessage5=\u8BF7\u6C42\u52A8\u4F5C\u672A\u590D\u4F4D
+universal_directives=\u6307\u4EE4
 
 
 

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties

@@ -62,5 +62,6 @@ universal_actionMessage4=The request action has been reset
 universal_actionMessage5=The request action is not reset
 universal_notCreateInstMessage7=ray type is empty!
 universal_notCreateInstMessage8=The barcode is blank\uFF01
+universal_directives=Directives
 
 

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties

@@ -62,3 +62,4 @@ universal_actionMessage4=Tindakan permintaan telah disetel ulang
 universal_actionMessage5=Tindakan permintaan tidak disetel ulang
 universal_notCreateInstMessage7=ponypianmereka yang kosong!
 universal_notCreateInstMessage8=Kode batang kosong!
+universal_directives=Arahan

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties

@@ -62,6 +62,6 @@ universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93
 universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4D\u6761\u4EF6\u4E0D\u6EE1\u8DB3\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
 universal_notCreateInstMessage7=\u6258\u76D8\u7C7B\u578B\u4E3A\u7A7A!
 universal_notCreateInstMessage8=\u6761\u7801\u4E3A\u7A7A!
-
+universal_directives=\u6307\u4EE4
 
 

acs2/nladmin-ui/src/i18n/langs/monitor/en.js

@@ -66,6 +66,9 @@ export default {
       'photoelectric_signal': 'photoelectric signal',
       'mode': 'mode',
       'alarm': 'alarm',
+      'last_mission_number': 'Last Mission Number',
+      'the_subvolume_number': 'The Subvolume Number',
+      'pallet_type': 'Pallet Type',
       'ip_address': 'IP',
       'pallet_quantity': 'Pallet quantity',
       'instruction_information': 'instruction information',

acs2/nladmin-ui/src/i18n/langs/monitor/in.js

@@ -64,6 +64,9 @@ export default {
       'device_name': 'nama divais',
       'exception_message': 'pesan yang tidak biasa',
       'photoelectric_signal': 'Sinyal fotolistrik',
+      'last_mission_number': 'Nomor misi terakhir',
+      'the_subvolume_number': 'Nomor Subvolume',
+      'pallet_type': 'Jenis Palet',
       'mode': 'pola',
       'alarm': 'polisi',
       'ip_address': 'IP',

acs2/nladmin-ui/src/i18n/langs/monitor/zh.js

@@ -98,6 +98,9 @@ export default {
       'task_number': '任务号',
       'command': '动作',
       'disable': '是否禁用',
+      'last_mission_number': '上次任务号',
+      'the_subvolume_number': '子卷编号',
+      'pallet_type': '托盘类型',
       'current_temperature': '当前温度',
       'oven_finish': '烘箱完成',
       'house': '恒温倒计时-时',

acs2/nladmin-ui/src/views/acs/device/index.vue

@@ -50,6 +50,20 @@
               <el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否配置">
+            <el-select
+              v-model="query.is_config"
+              clearable
+              filterable
+              size="small"
+              placeholder="是否配置"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -259,6 +273,7 @@ export default {
       device_types: [],
       uploadShow: false,
       regions: [],
+      is_configs: [],
       rules: {
         device_code: [
           { required: true, message: '设备编码不能为空', trigger: 'blur' }
@@ -282,6 +297,10 @@ export default {
       get('region_type').then(data => {
         this.regions = data.content
       })
+      // 是否
+      get('TrueOrFalse').then(data => {
+        this.is_configs = data.content
+      })
     })
   },
   methods: {

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -209,6 +209,7 @@
                   v-model="form.start_point_code"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                   @change="showStartStorage"
                 >
@@ -257,6 +258,7 @@
                   v-model="form.next_point_code"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                   @change="showEndStorage"
                 >
@@ -312,6 +314,7 @@
                   v-model="form.start_point_code2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                 >
                   <el-option
@@ -359,6 +362,7 @@
                   v-model="form.next_point_code2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
                 >
                   <el-option
@@ -502,7 +506,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
         <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
         <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
-        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true":show-overflow-tooltip="true" width="150px" />
+        <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" width="150px" />
         <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
         <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />

acs2/nladmin-ui/src/views/system/dict/dictDetail.vue

@@ -21,6 +21,16 @@
         </div>
       </div>
       <!--表单组件-->
+      <!-- <el-button
+            slot="right"
+            class="filter-item"
+            type="warning"
+            icon="el-icon-upload2"
+            size="mini"
+            @click="uploadShow = true"
+          >
+            {{ $t('auto.common.import') }}
+          </el-button> -->
       <el-dialog
         append-to-body
         :close-on-click-modal="false"
@@ -33,13 +43,13 @@
           <el-form-item :label="$t('dict.other.Department_label')" prop="label">
             <el-input v-model="form.label" style="width: 370px;" />
           </el-form-item>
-          <el-form-item :label="$t('dict.other.Department_label_zh')" prop="label">
+          <el-form-item :label="$t('dict.other.Department_label_zh')" prop="zh_label">
             <el-input v-model="form.zh_label" style="width: 370px;" />
           </el-form-item>
-          <el-form-item :label="$t('dict.other.Department_label_en')" prop="label">
+          <el-form-item :label="$t('dict.other.Department_label_en')" prop="en_label">
             <el-input v-model="form.en_label" style="width: 370px;" />
           </el-form-item>
-          <el-form-item :label="$t('dict.other.Department_label_in')" prop="label">
+          <el-form-item :label="$t('dict.other.Department_label_in')" prop="in_label">
             <el-input v-model="form.in_label" style="width: 370px;" />
           </el-form-item>
           <el-form-item :label="$t('dict.other.Dictionary_value')" prop="value">
@@ -116,7 +126,9 @@ import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 import i18n from '@/i18n'
 
-const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
+const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null,
+  para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null,
+  updateTime: null, zh_label: null, in_label: null, en_label: null }
 
 export default {
   components: { pagination, rrOperation, udOperation },

acs2/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -138,6 +138,12 @@
             <el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="申请指令标记" prop="requireActionSucess" label-width="120px">
+          <el-radio-group v-model="form.requireActionSucess">
+            <el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
+            <el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible7 = false">{{ $t('auto.common.Cancel') }}</el-button>
@@ -406,13 +412,18 @@ export default {
             }
             this.Stages.push(tempObject)
           }
-          if (this.language === 'in') {
+          if (i18n.locale === 'in') {
             const tempObject = {
               'stage_name': data[i].in_stage_name,
               'stage_code': data[i].stage_code
             }
             this.Stages.push(tempObject)
           }
+          /* const tempObject = {
+            'stage_name': data[i].in_stage_name,
+            'stage_code': data[i].stage_code
+          }
+          this.Stages.push(tempObject) */
         }
         console.log(this.Stages)
       })
@@ -459,11 +470,6 @@ export default {
         } else if (clickObj.data.driver_type === 'slit_two_manipulator') {
           this.dialogFormVisible4 = true
         } else if (clickObj.data.driver_type === 'siemens_conveyor') {
-          // if (clickObj.data.device_name.includes('1016')) {
-          //   this.dialogFormVisible7 = true
-          // } else {
-          //   this.dialogFormVisible5 = true
-          // }
           this.dialogFormVisible7 = true
         } else if (clickObj.data.driver_type === 'siemens_conveyor_ckk') {
           this.dialogFormVisible7 = true
@@ -563,7 +569,7 @@ export default {
             const obj = { name: i18n.t('monitor.click.last_instruction_message'), value: data[val] }
             this.arr.push(obj)
           } else if (val === 'container_type') {
-            const obj = { name: '托盘类型', value: data[val] }
+            const obj = { name: i18n.t('monitor.click.pallet_type'), value: data[val] }
             this.arr.push(obj)
           } else if (val === 'barcode') {
             const obj = { name: i18n.t('monitor.click.barcode'), value: data[val] }
@@ -656,7 +662,7 @@ export default {
             const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] }
             this.arr.push(obj)
           } else if (val === 'last_task') {
-            const obj = { name: '上次任务号', value: data[val] }
+            const obj = { name: i18n.t('monitor.click.last_mission_number'), value: data[val] }
             this.arr.push(obj)
           } else if (val === 'is_disable') {
             const obj = { name: i18n.t('monitor.click.disable'), value: data[val] }
@@ -706,6 +712,9 @@ export default {
           } else if (val === 'hand_barcode') {
             const obj = { name: '补码信息', value: data[val] }
             this.arr.push(obj)
+          } else if (val === 'hand_barcode1') {
+            const obj = { name: i18n.t('monitor.click.the_subvolume_number'), value: data[val] }
+            this.arr.push(obj)
           } else if (val === 'x') {
             const obj = { name: 'X', value: data[val] }
             this.arr.push(obj)

lms/nladmin-system/src/main/java/org/nl/config/lucene/AsyncLuceneAppender.java

@@ -26,7 +26,12 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender {
                 mdcPropertyMap.put("traceId", traceId);
             }
         }
-        super.append(event);
+        try {
+            super.append(event);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return;
+        }
     }
 
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -5683,9 +5683,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 //如果为返检出库或者改切出库删除对应的包装关系
                 JSONArray dis_rows = new JSONArray();
                 if (jo_mst.getString("is_overdue").equals("1")) {
-                    dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' and is_overdue = '0'").getResultJSONArray(0);
+                    dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' and is_overdue = '0' and box_no = '"+jsonSub.getString("package_box_sn")+"'").getResultJSONArray(0);
                 } else {
-                    dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
+                    dis_rows = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' and box_no = '"+jsonSub.getString("package_box_sn")+"'").getResultJSONArray(0);
                 }
 
                 for (int j = 0; j < dis_rows.size(); j++) {