From 365a350174c01e2eac05753a3e8c747c081783e1 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Sun, 15 Dec 2024 22:47:32 +0800 Subject: [PATCH] =?UTF-8?q?opt=EF=BC=9A=E4=BC=98=E5=8C=96=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E5=92=8C=E7=94=9F=E6=88=90=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=89=B9=E5=8F=B7=EF=BC=8C=E8=BE=85=E5=8A=A9=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E6=89=8B=E5=B7=A5=E5=BD=95=E5=85=A5=E7=AD=89?= =?UTF-8?q?=E6=83=85=E5=86=B5=E6=95=B0=E6=8D=AE=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncReceiptProcessHandler.java | 10 +- .../service/impl/MdGruopDickServiceImpl.java | 3 +- .../wms/md_manage/group_dick/ViewDialog.vue | 95 ++++++++++--------- 3 files changed, 55 insertions(+), 53 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java index f2e305b3..6f2406e1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/classprocessimpl/SyncReceiptProcessHandler.java @@ -1,6 +1,7 @@ package org.nl.wms.flow_manage.flow.service.classprocessimpl; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -65,7 +66,6 @@ public class SyncReceiptProcessHandler implements ClassProcess { if (StringUtils.isEmpty(formid)) { throw new BadRequestException("回传失败:回传数据form_data中数据格式不是formid,data类型"); } - handleBillEntity(pmFormData.getForm_type(), formData); String json = formData.toJSONString(); try { @@ -113,7 +113,7 @@ public class SyncReceiptProcessHandler implements ClassProcess { private void handleBillEntity(String formType, JSONObject formData) { JSONArray fEntityArray = formData.getJSONObject("Model").getJSONArray("FEntity"); //判断生产入库的手工录入与MRP生成方式需回传不同的源单信息 - if ("0".equals(formData.getString("FSrcEntryId")) && "PRD_INSTOCK".equals(formType)) { + if ("0".equals(formData.getString("FSrcEntryId")) && "RECEIPT_PRD".equals(formType)) { //查询工序汇报单 ErpQuery reportQuery = new ErpQuery(); reportQuery.setFilterString("FMoNumber ='" + formData.getString("moNumber") + "'"); @@ -142,11 +142,11 @@ public class SyncReceiptProcessHandler implements ClassProcess { } } //判断生产领料单的批次与辅助单位 - if ("PRD_PickMtrl".equals(formType)) { + if ("RECEIPT_PickMtrl".equals(formType)) { for (int i = 0; i < fEntityArray.size(); i++) { - List materialList = iMdMeMaterialbaseService.list(new LambdaQueryWrapper().eq(MdMeMaterialbase::getMaterial_id, formData.getString("material_id"))); - MdMeMaterialbase materialInfo = materialList.get(0); JSONObject fEntity = fEntityArray.getJSONObject(i); + List materialList = iMdMeMaterialbaseService.list(new LambdaQueryWrapper().eq(MdMeMaterialbase::getMaterial_code,JSON.parseObject(fEntity.getString("FMaterialId")).getString("FNumber") )); + MdMeMaterialbase materialInfo = materialList.get(0); //没有启用批次号 if ("0".equals(materialInfo.getPrint_no())) { if (fEntity.containsKey("FLot")) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index 3f137487..8e76ad2c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -81,7 +81,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl tableData = (List)forms.remove("item"); if (CollectionUtils.isEmpty(forms)){ @@ -171,6 +171,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - - - - - - -
@@ -65,20 +65,21 @@ :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > - + + - + - - + + @@ -98,8 +99,8 @@ import crudVehicleMater from '@/views/wms/md_manage/vehicleMater/vehicleMater' export default { name: 'ViewDialog', components: { formstruc, crudVehicleMater }, - mixins: [ crud() ], - dicts: [ 'FORM_STATUS' ], + mixins: [crud()], + dicts: ['FORM_STATUS'], props: { dialogShow: { type: Boolean, @@ -136,9 +137,9 @@ export default { formstruc.getHeader('md_group_dick').then(res => { this.cols = res }), - formstruc.getHeader('md_pb_vehicleMater').then(res => { - this.dtlCols = res - }) + formstruc.getHeader('md_pb_vehicleMater').then(res => { + this.dtlCols = res + }) }, setForm(row) { this.dialogVisible = true