root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-04 15:37:53 +08:00
parent 7bcac23742
commit b833fb07bf
9 changed files with 79 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java
View File

@@ -105,6 +105,9 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
String customername = jo.getString("customername");
String customerdescription = jo.getString("customerdescription");
String width = jo.getString("width");
String struct_code = jo.getString("struct_code");
String dateoffginbound = jo.getString("dateoffginbound");
String packageboxsn = jo.getString("packageboxsn");
HashMap map = new HashMap<>();
if (StrUtil.isNotEmpty(material_code)) {
@@ -134,6 +137,15 @@ public class CrmToLmsServiceImpl implements CrmToLmsService {
if (StrUtil.isNotEmpty(width)) {
map.put("width", width);
}
if (StrUtil.isNotEmpty(packageboxsn)) {
map.put("packageboxsn", packageboxsn);
}
if (StrUtil.isNotEmpty(dateoffginbound)) {
map.put("dateoffginbound", dateoffginbound);
}
if (StrUtil.isNotEmpty(struct_code)) {
map.put("struct_code", struct_code);
}
//将查询条件带入，查询LMS成品库库存信息
JSONArray rows = WQL.getWO("QCRM_001").addParamMap(map).addParam("flag", "1").process().getResultJSONArray(0);

25
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -25,7 +25,9 @@ import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.tasks.CoolCutTask;
import org.nl.wms.st.inbill.service.CheckOutBillService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.HashMap;
@Service
@@ -54,6 +56,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject momRollFoilStart(JSONObject param) {
log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString());
@@ -135,6 +138,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject momRollFoilWeighing(JSONObject param) {
log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString());
@@ -183,6 +187,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject momRollFoilComplete(JSONObject param) {
log.info("momRollFoilComplete接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
@@ -242,6 +247,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject momRollBakeNextSpecTransfer(JSONObject param) {
log.info("momRollBakeNextSpecTransfer接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
@@ -327,6 +333,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject cutPlanTransfer(JSONObject param) {
log.info("cutPlanTransfer接口输入参数为：-------------------" + param.toString());
@@ -450,6 +457,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject callNextAssAndMomRoll(JSONObject param) {
log.info("callNextAssAndMomRoll接口输入参数为：-------------------" + param.toString());
@@ -636,6 +644,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject childRollCutStartComp(JSONArray param) {
log.info("childRollCutStartComp接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
@@ -723,6 +732,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject childRollPackComplete(JSONObject param) {
log.info("childRollPackComplete接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
@@ -732,7 +742,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
// if (StrUtil.equals(is_mesTolms, "1")) {
String isUnPlanProductionBox = param.getString("isUnPlanProductionBox"); // 生产订单
String QuanlityInBox = param.getString("QuanlityInBox"); // 产品编码
String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 分切机台编码
String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 保质期
String ProductName = param.getString("ProductName"); // 来源卷位置
String Description = param.getString("Description"); // 来源卷位置
String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置
@@ -765,6 +775,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
String UnPlanProductProperty2 = detail.getString("UnPlanProductProperty2");
String UnPlanProductProperty3 = detail.getString("UnPlanProductProperty3");
String sap_pcsn = detail.getString("Attribute1");//SAP批次
String thickness_request = detail.getString("Attribute2");//物料主数据厚度
String width_standard = detail.getString("Attribute3");//要求幅宽
JSONObject jo = new JSONObject();
jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
@@ -776,7 +788,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
jo.put("box_high", box_high);
jo.put("quanlity_in_box", QuanlityInBox);
// jo.put("box_weight", BoxWeight);
jo.put("quality_guaran_period", QualityGuaranPeriod);
if (QualityGuaranPeriod.equals("0天")){
jo.put("quality_guaran_period", "90天");
}else {
jo.put("quality_guaran_period", QualityGuaranPeriod);
}
jo.put("sale_order_name", SaleOrderName);
jo.put("customer_name", CustomerName);
jo.put("customer_description", CustomerDescription);
@@ -794,6 +811,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
jo.put("un_plan_product_property1", UnPlanProductProperty1);
jo.put("un_plan_product_property2", UnPlanProductProperty2);
jo.put("un_plan_product_property3", UnPlanProductProperty3);
jo.put("width_standard",width_standard);
jo.put("thickness_request",thickness_request);
jo.put("status", "0");
jo.put("create_id", "1");
jo.put("create_name", "管理员");
@@ -829,6 +848,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject inventoryTransferInfoSync(JSONObject param) {
log.info("inventoryTransferInfoSync接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();
@@ -942,6 +962,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
*/
@LokiLog(type = LokiLogType.MES_TO_LMS)
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject childRollInfoUpdate(JSONObject param) {
log.info("childRollInfoUpdate接口输入参数为：-------------------" + param.toString());
JSONObject result = new JSONObject();

12
lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
View File

@@ -18,6 +18,9 @@
输入.material_name TYPEAS s_string
输入.mfgordername TYPEAS f_string
输入.customername TYPEAS s_string
输入.packageboxsn TYPEAS s_string
输入.dateoffginbound TYPEAS s_string
输入.struct_code TYPEAS s_string
输入.customerdescription TYPEAS s_string
输入.width TYPEAS f_string
@@ -85,6 +88,15 @@
ENDOPTION
OPTION 输入.width <> ""
sub.width >= 输入.width
ENDOPTION
OPTION 输入.struct_code <> ""
stor.ext_id = 输入.struct_code
ENDOPTION
OPTION 输入.dateoffginbound <> ""
sub.date_of_FG_inbound = 输入.dateoffginbound
ENDOPTION
OPTION 输入.packageboxsn <> ""
sub.package_box_sn = 输入.packageboxsn
ENDOPTION
ENDSELECT
ENDQUERY

6
lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java
View File

@@ -117,4 +117,10 @@ public class SubpackagerelationDto implements Serializable {
/** 高 */
private String box_high;
/** 物料主数据厚度 */
private String thickness_request;
/** 要求幅宽 */
private String width_standard;
}

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

7
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
View File

@@ -109,13 +109,11 @@
ENDOPTION
OPTION 输入.begin_time <> ""
mst.biz_date >= 输入.begin_time
mst.input_time >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
mst.biz_date <= 输入.end_time
mst.input_time <= 输入.end_time
ENDOPTION
OPTION 输入.material_search <> ""
(
mb.material_code like 输入.material_search
@@ -123,7 +121,6 @@
mb.material_name like 输入.material_search
)
ENDOPTION
ENDSELECT
ENDPAGEQUERY
ENDIF