diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 16920ec4f..a5b1a5f69 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -498,8 +498,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { jo.put("point_code1", cool_ivt.getString("full_point_code")); jo.put("point_code2", cut_jo.getString("full_point_code")); - jo.put("point_code3", cut_jo.getString("full_point_code")); - jo.put("point_code4", cool_ivt.getString("full_point_code")); + jo.put("point_code3", cut_jo.getString("empty_point_code")); + jo.put("point_code4", cool_ivt.getString("empty_point_code")); jo.put("vehicle_code", parent_container_name); jo.put("vehicle_code2", cut_jo.getString("empty_vehicle_code")); jo.put("product_area", cool_ivt.getString("product_area")); @@ -689,6 +689,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { String ProductName = param.getString("ProductName"); // 来源卷位置 String Description = param.getString("Description"); // 来源卷位置 String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置 + String box_type = param.getString("Attribute1"); // 木箱料号 JSONArray details = param.getJSONArray("details"); @@ -710,10 +711,13 @@ public class MesToLmsServiceImpl implements MesToLmsService { String UnPlanProductProperty1 = detail.getString("UnPlanProductProperty1"); String UnPlanProductProperty2 = detail.getString("UnPlanProductProperty2"); String UnPlanProductProperty3 = detail.getString("UnPlanProductProperty3"); + String sap_pcsn = detail.getString("Attribute1");//SAP批次 JSONObject jo = new JSONObject(); jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); jo.put("package_box_sn", PackageBoxSN); + jo.put("sap_pcsn", sap_pcsn); + jo.put("box_type", box_type); jo.put("quanlity_in_box", QuanlityInBox); jo.put("box_weight", BoxWeight); jo.put("quality_guaran_period", QualityGuaranPeriod); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index f09d1f153..dc94592b1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -76,7 +76,6 @@ public class SapToLmsServiceImpl implements SapToLmsService { jsonMst.put("bill_type", "1001"); jsonMst.put("source_id", json.getLongValue("VBELN")); jsonMst.put("source_name", "交货单"); - jsonMst.put("source_type", lfart); // 明细 JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0); @@ -98,7 +97,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { String iostorinv_id = checkOutBillService.insertDtl(jsonMst); JSONObject jsonObject = new JSONObject(); jsonObject.put("iostorinv_id",iostorinv_id); - checkOutBillService.allDiv(jsonObject); + //checkOutBillService.allDiv(jsonObject); result.put("RTYPE", "S"); result.put("RTMSG", "操作成功!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java index 059f80d27..3e352af0a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/PointStatusServiceImpl.java @@ -34,7 +34,7 @@ public class PointStatusServiceImpl implements PointStatusService { } //查询该编码是否属于母卷 - JSONObject raw_jo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder").query("container_name = '"+container_name+" AND is_delete = '0'").uniqueResult(0); + JSONObject raw_jo = WQLObject.getWQLObject("pdm_bi_rawfoilworkorder").query("container_name = '"+container_name+"' AND is_delete = '0'").uniqueResult(0); //查询该点对应的是什么位置 JSONObject cut_point = WQLObject.getWQLObject("ST_IVT_CutPointIvt").query("full_point_code = '" + point_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(cut_point)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java index 56c7cfdfd..dcbcaa713 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java @@ -18,7 +18,9 @@ import org.nl.wms.sch.tasks.InTask; import org.nl.wms.st.inbill.service.RawAssistIStorService; import org.nl.wms.st.inbill.service.impl.InbillServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.HashMap; /** @@ -61,6 +63,7 @@ public class ProductInstorServiceImpl implements ProductInstorService { } @Override + @Transactional(rollbackFor = Exception.class) public JSONObject confirm(JSONObject whereJson) { String box_no = whereJson.getString("box_no"); //1-报废入库；2-生产入库；3-退货入库 @@ -68,7 +71,7 @@ public class ProductInstorServiceImpl implements ProductInstorService { String material_code = whereJson.getString("material_code"); String is_virtual = whereJson.getString("is_virtual"); - JSONArray box_rows = whereJson.getJSONArray("box_rows"); + ArrayList box_rows = (ArrayList) whereJson.get("box_jo"); HashMap map = new HashMap<>(); map.put("box_no", box_no); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 5ce2bc0b0..a8e285f8e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -75,4 +75,37 @@ sub.package_box_SN = 输入.box_no ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + package_box_SN, + container_name, + product_name, + product_description, + net_weight + FROM + pdm_bi_subpackagerelation sub + WHERE + sub.status = '0' + AND + sub.package_box_SN = 输入.box_no + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT + * + FROM + st_ivt_structattr + WHERE + sect_code = 'XN01' + AND lock_type = '1' + AND is_delete = '0' + AND IFNULL( storagevehicle_code, '' ) = '' + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java index effafed2f..719aeaf5f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java @@ -102,4 +102,10 @@ public class SubpackagerelationDto implements Serializable { /** 是否需要拆包重打子卷标签 */ private String isUnPackBox; + + /** 木箱料号 */ + private String box_type; + + /** sap批次 */ + private String sap_pcsn; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java index 90e5dc585..6eef7e9b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java @@ -38,7 +38,7 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService @Override public Map queryAll(Map whereJson, Pageable page){ WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "package_box_SN desc"); + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "package_box_sn desc"); final JSONObject json = rb.pageResult(); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java index 7fa88f462..0002e47fa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java @@ -48,7 +48,7 @@ public class HotPointIvtServiceImpl implements HotPointIvtService { map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); - JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,group_name,point_code"); + JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 03f498ad2..dd9846b60 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -150,7 +150,7 @@ public class CoolCutTask extends AbstractAcsTask { WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo2); //更新冷却区空轴库存 - JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code4 + "'").uniqueResult(0); + JSONObject jsonCoolIvt2 = WQLObject.getWQLObject("st_ivt_coolpointivt").query("empty_point_code = '" + point_code4 + "'").uniqueResult(0); jsonCoolIvt2.put("empty_point_status", "02"); jsonCoolIvt2.put("empty_vehicle_code", jsonTask.getString("vehicle_code2")); jsonCoolIvt2.put("cool_ivt_status", "01"); @@ -260,6 +260,7 @@ public class CoolCutTask extends AbstractAcsTask { json.put("point_code3", point_code3); json.put("point_code4", point_code4); json.put("vehicle_code", form.getString("vehicle_code")); + json.put("vehicle_code2", form.getString("vehicle_code2")); json.put("handle_class", THIS_CLASS); json.put("create_id", currentUserId); json.put("create_name", currentUsername); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index 79212fc68..9d8bbe1ca 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -74,7 +74,7 @@ LEFT JOIN ( SELECT count(d.struct_id) AS num, - d.iostorinv_id + MAX(d.iostorinv_id) AS iostorinv_id FROM ST_IVT_IOStorInvDis d WHERE diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index 6e3cb2e97..95aafc7f3 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -5,80 +5,164 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
取消 @@ -98,6 +182,7 @@ + @@ -109,6 +194,7 @@ {{ dict.label.IS_OR_NOT[scope.row.is_un_plan_production] }} + @@ -145,7 +231,7 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -const defaultForm = { workorder_id: null, package_box_SN: null, quanlity_in_box: null, box_weight: null, quality_guaran_period: null, sale_order_name: null, customer_name: null, customer_description: null, product_name: null, product_description: null, date_of_FG_inbound: null, container_name: null, width: null, thickness: null, mass_per_unit_area: null, net_weight: null, length: null, date_of_production: null, is_un_plan_production: null, un_plan_product_property1: null, un_plan_product_property2: null, un_plan_product_property3: null, remark: null, create_id: null, create_name: null, create_time: null, status: null, isRePrintPackageBoxLabel: null, isUnPackBox: null } +const defaultForm = { workorder_id: null, package_box_sn: null, quanlity_in_box: null, box_weight: null, quality_guaran_period: null, sale_order_name: null, customer_name: null, customer_description: null, product_name: null, product_description: null, date_of_FG_inbound: null, container_name: null, width: null, thickness: null, mass_per_unit_area: null, net_weight: null, length: null, date_of_production: null, is_un_plan_production: null, un_plan_product_property1: null, un_plan_product_property2: null, un_plan_product_property3: null, box_type: null, sap_pcsn: null, remark: null, create_id: null, create_name: null, create_time: null, status: null, isRePrintPackageBoxLabel: null, isUnPackBox: null } export default { name: 'Subpackagerelation', dicts: ['sub_package_relation', 'IS_OR_NOT'], diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue index 56c6a03ec..f937d24cb 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue @@ -114,22 +114,10 @@ type="primary" icon="el-icon-plus" size="mini" - :disabled="bill_btn" @click="insertEvent()" > 添加箱号物料 - - 新增一行 -
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue index 1ca1adf0a..b475e9057 100644 --- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -241,7 +241,6 @@ export default { return CRUD({ title: '', optShow: { add: true, reset: true }, - query: { bill_type: '0001' }, idField: 'iostorinv_id', url: '/api/in/rawAssist', crudMethod: { ...rawAssist }