yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口修改

Browse Source
jg-waiwang-pro
Vayne02 3 months ago
parent 27b33229c2
commit eb928cb4e4
15 changed files with 270 additions and 144 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml
Unescape View File

@ -2,7 +2,7 @@
server: server:
tomcat: tomcat:
uri-encoding: UTF-8 #tomcat编码 uri-encoding: UTF-8 #tomcat编码
port: 50000 #tomcat端口 port: 30000 #tomcat端口
spring: spring:
devtools: #spring开发者工具模块 devtools: #spring开发者工具模块
@ -114,7 +114,7 @@ springdoc:
config: config:
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用) ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用) FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)
AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用) AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用)
# ===================== 是否开启测试环境 ===================== # ===================== 是否开启测试环境 =====================

16
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
Unescape View File

@ -897,9 +897,9 @@
a.expect_arrive_date_start AS DELV_DT, a.expect_arrive_date_start AS DELV_DT,
b.CODE AS SUPPLIER_CD, b.CODE AS SUPPLIER_CD,
b.NAME AS SUPPLIER_NM, b.NAME AS SUPPLIER_NM,
b.reserved_fields4 AS SUPPLIER_SITE_ID, b.reserved_fields5 AS SUPPLIER_SITE_ID,
b.reserved_fields5 AS RESERVE2, b.reserved_fields4 AS RESERVE2,
'CYN' AS CURRENCY_CD, 'CNY' AS CURRENCY_CD,
CASE CASE
a.transaction_mode a.transaction_mode
WHEN '1' THEN WHEN '1' THEN
@ -961,7 +961,7 @@
'' as CHECK_EMP_ID, '' as CHECK_EMP_ID,
null as CHECK_DTM, null as CHECK_DTM,
'B' as ORD_STATUS, 'B' as ORD_STATUS,
a.f_creator_user_id as CREATE_EMP_ID, e.f_real_name as CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM, a.f_creator_time as CREATE_DTM,
'N' as READ_FLAG, 'N' as READ_FLAG,
null as READ_TIME, null as READ_TIME,
@ -997,20 +997,20 @@
b.id AS ID, b.id AS ID,
c.f_en_code AS COMP_CD, c.f_en_code AS COMP_CD,
a.CODE AS ORD_NO, a.CODE AS ORD_NO,
LPAD(b.ord_ln,2,0) as ORD_LN, LPAD(b.ord_ln,3,0) as ORD_LN,
d.CODE AS ITEM_CD, d.CODE AS ITEM_CD,
d.NAME AS ITEM_NM, d.NAME AS ITEM_NM,
d.spec AS SPEC_TYPE, b.spec AS SPEC_TYPE,
b.business_num AS QUANTITY, b.business_num AS QUANTITY,
b.sales_main_unit_id AS UNIT, b.sales_main_unit_id AS UNIT,
f.price_rate AS CONTR_PRICE, f.price_rate AS CONTR_PRICE,
b.not_tax_price AS PRICE, b.not_tax_price AS PRICE,
b.business_price AS TAX_PRICE, b.business_price AS TAX_PRICE,
b.tax AS TAX_RATE, b.tax AS TAX_RATE,
f.tax_rate_code AS TAX_RATE_CD, concat('VAT_IN_',b.tax) AS TAX_RATE_CD,
b.not_tax_count AS AMOUNT, b.not_tax_count AS AMOUNT,
b.tax_count AS TOTAL_AMOUNT, b.tax_count AS TOTAL_AMOUNT,
'CYN' AS CURRENCY_CD, 'CNY' AS CURRENCY_CD,
a.expect_arrive_date_start AS DELV_DT, a.expect_arrive_date_start AS DELV_DT,
f.delv_tol_max as DELV_TOL_MAX, f.delv_tol_max as DELV_TOL_MAX,
f.delv_tol_min as DELV_TOL_MIN, f.delv_tol_min as DELV_TOL_MIN,

7
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
Unescape View File

@ -138,7 +138,7 @@
aa.spec AS SPECIFICATION, aa.spec AS SPECIFICATION,
aa.outbound_unit AS UNIT, aa.outbound_unit AS UNIT,
aa.outbound_number AS OUT_QUANTITY, aa.outbound_number AS OUT_QUANTITY,
'1' as OUT_FLAG, '2' as OUT_FLAG,
s.contract_no as contract_no, s.contract_no as contract_no,
g.f_real_name as CREATE_EMP_ID, g.f_real_name as CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM, a.f_creator_time as CREATE_DTM,
@ -153,10 +153,13 @@
null as ESB_DTM, null as ESB_DTM,
'' as ESB_MESSAGE, '' as ESB_MESSAGE,
IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE, IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE,
aa.batch_number as BATCH_ID aa.batch_number as BATCH_ID,
concat(ac.business_order_no,'-',LPAD(ab.ord_ln,3,0)) as PUR_ORDER
FROM FROM
jg_warehousing_outbound a jg_warehousing_outbound a
RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null
LEFT JOIN jg_warehousing_storage_product ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null
LEFT JOIN jg_warehousing_storage ac ON ab.warehousing_storage_id = ac.id AND ac.f_delete_mark is null
LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL
LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL

2
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
Unescape View File

@ -370,7 +370,7 @@
a.document_no AS RECEIPT_NO, a.document_no AS RECEIPT_NO,
a.warehousing_time AS RECEIPT_DTM, a.warehousing_time AS RECEIPT_DTM,
IF(a.warehousing_storage_type = '1',c.code,l.code) as ORD_NO, IF(a.warehousing_storage_type = '1',c.code,l.code) as ORD_NO,
aa.ord_ln as ORD_LN, LPAD(aa.ord_ln,3,0) as ORD_LN,
IF(a.warehousing_storage_type = '1',h.contract_number,q.contract_number) AS CON_CD, IF(a.warehousing_storage_type = '1',h.contract_number,q.contract_number) AS CON_CD,
IF(a.warehousing_storage_type = '1',h.contract_no,q.contract_no) AS CON_NO, IF(a.warehousing_storage_type = '1',h.contract_no,q.contract_no) AS CON_NO,
IF(a.warehousing_storage_type = '1',d.code,p.code) AS SUPPLIER_CD, IF(a.warehousing_storage_type = '1',d.code,p.code) AS SUPPLIER_CD,

33
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
Unescape View File

@ -168,8 +168,8 @@
<select id="queryWorkOrderProductByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel"> <select id="queryWorkOrderProductByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
select select
a.id as ID, a.id as ID,
m.yunguan_value as ORGANIZATION_CODE, IF(l.f_full_name = '日照济钢金属科技有限公司','RJ1',m.yunguan_value) as ORGANIZATION_CODE,
l.f_full_name as ORGANIZATION_NM, IF(l.f_full_name = '日照济钢金属科技有限公司','日照济钢金属科技有限公司(生产)',l.f_full_name) as ORGANIZATION_NM,
a.code as TASK_NO, a.code as TASK_NO,
'产出' as PRD_TY, '产出' as PRD_TY,
d.code as ITEM_CD, d.code as ITEM_CD,
@ -202,7 +202,8 @@
'' as ERR_MESSAGE, '' as ERR_MESSAGE,
'N' as ESB_STATUS, 'N' as ESB_STATUS,
null as ESB_DTM, null as ESB_DTM,
'' as ESB_MESSAGE '' as ESB_MESSAGE,
o.f_en_code as ADD_DEPT_CODE
from jg_work_order a from jg_work_order a
right join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null right join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
left join jg_product d on b.product_id = d.id and d.f_delete_mark is null left join jg_product d on b.product_id = d.id and d.f_delete_mark is null
@ -212,24 +213,25 @@
left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null
left join jg_product k on j.product_id = k.id and k.f_delete_mark is null left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
left join base_organize l on a.company_id = l.f_id and l.f_delete_mark is null left join base_organize l on a.company_id = l.f_id and l.f_delete_mark is null
left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value like concat('%',l.f_full_name) and m.f_delete_mark is null
left join jg_business_cargo n on b.cargo_id = n.id and n.f_delete_mark is null left join jg_business_cargo n on b.cargo_id = n.id and n.f_delete_mark is null
left join base_organize o on a.department_id = o.f_id and o.f_delete_mark is null
where a.f_delete_mark is null and a.id =#{id} where a.f_delete_mark is null and a.id =#{id}
</select> </select>
<select id="queryWorkOrderPrimaryByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel"> <select id="queryWorkOrderPrimaryByYunguan" resultType="jnpf.model.yunguan.YunguanProductProcessModel">
select select
a.id as ID, a.id as ID,
m.yunguan_value as ORGANIZATION_CODE, IF(l.f_full_name = '日照济钢金属科技有限公司','RJ1',m.yunguan_value) as ORGANIZATION_CODE,
l.f_full_name as ORGANIZATION_NM, IF(l.f_full_name = '日照济钢金属科技有限公司','日照济钢金属科技有限公司(生产)',l.f_full_name) as ORGANIZATION_NM,
a.code as TASK_NO, a.code as TASK_NO,
case c.is_input case c.is_input
when '1' then '原料' when '1' then '原料'
when '2' then '副产品' when '2' then '副产品'
end as PRD_TY, end as PROD_TY,
d.code as ITEM_CD, d.code as ITEM_CD,
d.name as ITEM_NM, d.name as ITEM_NM,
'原料' as PROD_TY, '投入' as PRD_TY,
c.spec as SPEC_TYPE, c.spec as SPEC_TYPE,
c.reality_num as QUANTITY, c.reality_num as QUANTITY,
a.work_time as PRD_DATE, a.work_time as PRD_DATE,
@ -240,7 +242,14 @@
a.code as TASK_NM, a.code as TASK_NM,
c.batch_number as BATCH_ID, c.batch_number as BATCH_ID,
'已完成' as STATUS_FLAG, '已完成' as STATUS_FLAG,
e.name as ATTR1, case e.name
when '日照金属打包线' then '打包产线'
when '日照金属剪切线' then '剪切产线'
when '日照金属破碎线' then '破碎产线'
when '日照金属火切线' then '火切产线'
when '日照金属众鹏委托加工线' then '众鹏委托加工产线'
when '日照金属龙口委托加工线' then '龙口委托加工产线'
end as ATTR1,
k.code as ATTR2, k.code as ATTR2,
k.name as ATTR3, k.name as ATTR3,
h.f_real_name as CREATE_EMP_ID, h.f_real_name as CREATE_EMP_ID,
@ -250,7 +259,8 @@
'' as ERR_MESSAGE, '' as ERR_MESSAGE,
'N' as ESB_STATUS, 'N' as ESB_STATUS,
null as ESB_DTM, null as ESB_DTM,
'' as ESB_MESSAGE '' as ESB_MESSAGE,
o.f_en_code as ADD_DEPT_CODE
from jg_work_order a from jg_work_order a
left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null left join jg_work_order_product b on a.id = b.work_id and b.f_delete_mark is null
right join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null right join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
@ -261,8 +271,9 @@
left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null left join jg_bom_item j on i.id = j.bom_id and j.f_delete_mark is null
left join jg_product k on j.product_id = k.id and k.f_delete_mark is null left join jg_product k on j.product_id = k.id and k.f_delete_mark is null
left join base_organize l on a.company_id = l.f_id and l.f_delete_mark is null left join base_organize l on a.company_id = l.f_id and l.f_delete_mark is null
left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value = l.f_full_name and m.f_delete_mark is null left join jg_dictionary_yunguan_data m on m.type_id = '564773000885326917' and m.zhihui_value like concat('%',l.f_full_name) and m.f_delete_mark is null
left join jg_business_cargo n on c.cargo_id = n.id and n.f_delete_mark is null left join jg_business_cargo n on c.cargo_id = n.id and n.f_delete_mark is null
left join base_organize o on a.department_id = o.f_id and o.f_delete_mark is null
where a.f_delete_mark is null and a.id =#{id} where a.f_delete_mark is null and a.id =#{id}
</select> </select>

18
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
Unescape View File

@ -27,6 +27,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import jnpf.util.wxutil.HttpUtil; import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.database.model.superQuery.SuperJsonModel;
@ -1063,7 +1064,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
//采购订单号 //采购订单号
yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode()); yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode());
//采购订单明细行 //采购订单明细行
yunguanSaleSettlementProductModel.setORD_LN(Integer.parseInt(cwsettlementsummaryModel.getOrdLn())); yunguanSaleSettlementProductModel.setORD_LN(Integer.valueOf(cwsettlementsummaryModel.getOrdLn()));
//采购入库单号 //采购入库单号
yunguanSaleSettlementProductModel.setRECEIPT_NO(cwsettlementsummaryModel.getDocmentNo()); yunguanSaleSettlementProductModel.setRECEIPT_NO(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModel.setCONTRACT_NO(contractLEntity.getContractNumber()); yunguanSaleSettlementProductModel.setCONTRACT_NO(contractLEntity.getContractNumber());
@ -1115,11 +1116,11 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setACCOUNT_NO(cwsettlementEntity.getCode()); yunguanSaleSettlementModel.setACCOUNT_NO(cwsettlementEntity.getCode());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementEntity.getCwsettlementsubjectList().get(0).getSubjectId()); SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementEntity.getCwsettlementsubjectList().get(0).getSubjectId());
yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getCode()); yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getCode());
yunguanSaleSettlementModel.setVENDOR_NAME(subjectbasicEntity.getName()); yunguanSaleSettlementModel.setVENDOR_NM(subjectbasicEntity.getName());
//供应商地点编码 //供应商地点编码
yunguanSaleSettlementModel.setVENDOR_SITE_CODE(subjectbasicEntity.getReservedFields4()); yunguanSaleSettlementModel.setVENDOR_SITE_CODE(subjectbasicEntity.getReservedFields5());
//供应商地点名称 //供应商地点名称
yunguanSaleSettlementModel.setATTRIBUTE10(subjectbasicEntity.getReservedFields5()); yunguanSaleSettlementModel.setATTRIBUTE10(subjectbasicEntity.getReservedFields4());
yunguanSaleSettlementModel.setATTRIBUTE2(contractLEntity.getContractNumber()); yunguanSaleSettlementModel.setATTRIBUTE2(contractLEntity.getContractNumber());
yunguanSaleSettlementModel.setATTRIBUTE4(contractLEntity.getContractNo()); yunguanSaleSettlementModel.setATTRIBUTE4(contractLEntity.getContractNo());
yunguanSaleSettlementModel.setCREATE_EMP_ID(cwsettlementEntity.getCreatorUserId()); yunguanSaleSettlementModel.setCREATE_EMP_ID(cwsettlementEntity.getCreatorUserId());
@ -1128,7 +1129,9 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setINVOICE_CNT(cwsettlementEntity.getInvoiceCnt()); yunguanSaleSettlementModel.setINVOICE_CNT(cwsettlementEntity.getInvoiceCnt());
yunguanSaleSettlementModel.setATTRIBUTE11(cwsettlementEntity.getAttribute11()); yunguanSaleSettlementModel.setATTRIBUTE11(cwsettlementEntity.getAttribute11());
yunguanSaleSettlementModel.setINVOICE_DATE(cwsettlementEntity.getInvoiceDate()); yunguanSaleSettlementModel.setINVOICE_DATE(cwsettlementEntity.getInvoiceDate());
yunguanSaleSettlementModel.setINVOICE_TYPE(cwsettlementEntity.getInvoiceType()); if (StringUtils.isNotEmpty(cwsettlementEntity.getInvoiceType())) {
yunguanSaleSettlementModel.setINVOICE_TYPE(cwsettlementEntity.getInvoiceType().equals("1") ? "CREDIT" : "STANDARD");
}
yunguanSaleSettlementModel.setINVOICE_NO(cwsettlementEntity.getInvoiceNo()); yunguanSaleSettlementModel.setINVOICE_NO(cwsettlementEntity.getInvoiceNo());
yunguanSaleSettlementModel.setINVOICE_CURRENCY("CNY"); yunguanSaleSettlementModel.setINVOICE_CURRENCY("CNY");
yunguanSaleSettlementModel.setTAX_RATE_CODE("VAT_IN_" + cwsettlementEntity.getCwsettlementsummaryList().get(0).getRate()); yunguanSaleSettlementModel.setTAX_RATE_CODE("VAT_IN_" + cwsettlementEntity.getCwsettlementsummaryList().get(0).getRate());
@ -1160,6 +1163,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setESB_STATUS("N"); yunguanSaleSettlementModel.setESB_STATUS("N");
yunguanSaleSettlementModel.setESB_DTM(null); yunguanSaleSettlementModel.setESB_DTM(null);
yunguanSaleSettlementModel.setESB_MESSAGE(""); yunguanSaleSettlementModel.setESB_MESSAGE("");
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel)); JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
@ -1196,7 +1200,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
}else{ }else{
yunguanSaleSettlementProductModel.setINVOICE_TYPE("T"); yunguanSaleSettlementProductModel.setINVOICE_TYPE("T");
} }
yunguanSaleSettlementProductModel.setATTRIBUTE4(cwsettlementsummaryModel.getDocmentNo()+"-"+cwsettlementsummaryModel.getLineNo()); yunguanSaleSettlementProductModel.setATTRIBUTE4(cwsettlementsummaryModel.getDocmentNo()+"-"+String.format("%03d",Integer.valueOf(cwsettlementsummaryModel.getLineNo())));
//销售订单号 //销售订单号
yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode()); yunguanSaleSettlementProductModel.setORD_NO(cwsettlementsummaryModel.getBusinessCode());
//销售订单行号 //销售订单行号
@ -1205,7 +1209,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setDORD_NO(cwsettlementsummaryModel.getDocmentNo()); yunguanSaleSettlementProductModel.setDORD_NO(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModel.setCONTRACT_CD(contractLEntity.getContractNumber()); yunguanSaleSettlementProductModel.setCONTRACT_CD(contractLEntity.getContractNumber());
yunguanSaleSettlementProductModel.setKH_CONTR_NO(contractLEntity.getContractNo()); yunguanSaleSettlementProductModel.setKH_CONTR_NO(contractLEntity.getContractNo());
yunguanSaleSettlementProductModel.setCUST_ID(subjectbasicEntity.getId()); yunguanSaleSettlementProductModel.setCUST_ID(subjectbasicEntity.getCode());
yunguanSaleSettlementProductModel.setCUST_NAME(subjectbasicEntity.getName()); yunguanSaleSettlementProductModel.setCUST_NAME(subjectbasicEntity.getName());
yunguanSaleSettlementProductModel.setITEM_NO(productWarehouseEntity.getCode()); yunguanSaleSettlementProductModel.setITEM_NO(productWarehouseEntity.getCode());
yunguanSaleSettlementProductModel.setITEM_NM(productWarehouseEntity.getName()); yunguanSaleSettlementProductModel.setITEM_NM(productWarehouseEntity.getName());

23
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
Unescape View File

@ -911,16 +911,19 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
warehousingOutboundPoundlistService.saveOrUpdate(entitys); warehousingOutboundPoundlistService.saveOrUpdate(entitys);
} }
} }
// if (entity.getWarehousingOutboundType().equals("12")){ if (entity.getWarehousingOutboundType().equals("12")){
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId()); List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) { if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList)); JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
// if (ObjectUtil.isNotEmpty(saleCode)){ if (ObjectUtil.isNotEmpty(saleCode)){
// if (saleCode.get("code").equals("200")) { entity.setErpMark(saleCode.get("code").toString());
// } entity.setErpMassage(saleCode.get("errmsg").toString());
// } }else {
// } entity.setErpMark("N");
// } entity.setErpMassage("ESB返回为空");
}
}
}
} }
@Override @Override

28
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
Unescape View File

@ -963,16 +963,22 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
warehousingStoragePoundlistService.saveOrUpdate(entitys); warehousingStoragePoundlistService.saveOrUpdate(entitys);
} }
} }
// if (entity.getWarehousingStorageType().equals("15")){ if (entity.getWarehousingStorageType().equals("15")){
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId()); List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) { if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList)); JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
// if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
// } entity.setErpMark(purchaseCode.get("code").toString());
// } entity.setErpMassage(purchaseCode.get("errmsg").toString());
// } }
// } }else{
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}
}
this.saveOrUpdate(entity);
} }
@ -1169,7 +1175,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
organize = organize.replace("]",""); organize = organize.replace("]","");
warehousingStorageQueryWrapper.like("a.organize_json_id",organize); warehousingStorageQueryWrapper.like("a.organize_json_id",organize);
} }
// warehousingStorageQueryWrapper.eq("a.yunguan_mark","Y"); warehousingStorageQueryWrapper.eq("a.yunguan_mark","Y");
warehousingStorageQueryWrapper.isNull("a.f_delete_mark"); warehousingStorageQueryWrapper.isNull("a.f_delete_mark");
IPage<WarehousingStorageEntity> userIPage; IPage<WarehousingStorageEntity> userIPage;
if(StringUtil.equals(warehousingStoragePagination.getType(), "1")){ if(StringUtil.equals(warehousingStoragePagination.getType(), "1")){

76
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java
Unescape View File

@ -635,33 +635,55 @@ public class BusinessOrderController {
}else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){ }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){
entity.setStatus("4");//销售单直送审核通过后状态改为待出库 entity.setStatus("4");//销售单直送审核通过后状态改为待出库
} }
// if (entity.getBusinessType().equals("1")) { if (entity.getBusinessType().equals("1")) {
// YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id); YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
// if (ObjectUtil.isNotEmpty(purchaseOrder)) { if (ObjectUtil.isNotEmpty(purchaseOrder)) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder)); JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
// if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
// List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id); List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
// JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
// if(ObjectUtil.isNotEmpty(purchaseCode)){ if(ObjectUtil.isNotEmpty(purchaseCode)){
// System.out.println(purchaseCode.toString()); entity.setErpMark(purchaseProductCode.get("code").toString());
// } entity.setErpMassage(purchaseProductCode.get("errmsg").toString());
// } }else{
// } entity.setErpMark("N");
// } entity.setErpMassage("ESB返回为空");
// }else if (entity.getBusinessType().equals("2")){ }
// YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id); }else {
// if (ObjectUtil.isNotEmpty(saleOrder)){ entity.setErpMark(purchaseCode.get("code").toString());
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder)); entity.setErpMassage(purchaseCode.get("errmsg").toString());
// if (ObjectUtil.isNotEmpty(saleCode)) { }
// if (saleCode.get("code").equals("200")) { }else {
// List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id); entity.setErpMark("N");
// JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); entity.setErpMassage("ESB返回为空");
// System.out.println(saleProductCode); }
// } }
// } }else if (entity.getBusinessType().equals("2")){
// } YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
// } if (ObjectUtil.isNotEmpty(saleOrder)){
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
if (ObjectUtil.isNotEmpty(saleCode)) {
if (saleCode.get("code").equals("200")) {
List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
if (ObjectUtil.isNotEmpty(saleProductCode)){
entity.setErpMark(saleCode.get("code").toString());
entity.setErpMassage(saleCode.get("errmsg").toString());
}else{
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}else{
entity.setErpMark(saleCode.get("code").toString());
entity.setErpMassage(saleCode.get("errmsg").toString());
}
}else {
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}
}
businessOrderService.saveOrUpdate(entity); businessOrderService.saveOrUpdate(entity);
} }
} }

52
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java
Unescape View File

@ -648,32 +648,32 @@ public class CwsettlementController {
} }
cwsettlementForm.setCreatorUserId(entity.getCreatorUserId()); cwsettlementForm.setCreatorUserId(entity.getCreatorUserId());
cwsettlementService.saveOrUpdate(cwsettlementForm,id,false); cwsettlementService.saveOrUpdate(cwsettlementForm,id,false);
// FlowTaskEntity flowTaskEntity = flowTaskService.getById(id); FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
// if (flowTaskEntity!=null){ if (flowTaskEntity!=null){
// QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>(); QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>();
// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId()); flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId());
// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId()); flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
// List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper); List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
// if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) { if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
// ActionResult entity1 = this.info(id); ActionResult entity1 = this.info(id);
// Map<String, Object> map = (Map<String, Object>) entity1.getData(); Map<String, Object> map = (Map<String, Object>) entity1.getData();
// CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions()); CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions());
// //推送结算单到运管 //推送结算单到运管
// if(ObjectUtil.equals(entity.getType(), "2")){ if(ObjectUtil.equals(entity.getType(), "2")){
// //销售 //销售
// boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity); boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
// if(headFlag){ if(headFlag){
// boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity); boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
// } }
// }else{ }else{
// //采购 //采购
// boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity); boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
// if(headFlag){ if(headFlag){
// boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity); boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
// } }
// } }
// } }
// } }
}catch(Exception e){ }catch(Exception e){
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }

12
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java
Unescape View File

@ -796,12 +796,12 @@ public class WorkOrderController {
warehousingOutboundController.createWork(id,warehousingOutboundForm); warehousingOutboundController.createWork(id,warehousingOutboundForm);
} }
} }
// List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id); List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
// List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id); List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
// yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1); yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
// JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList)); JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
// if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){ if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
// } }
} }
} }

105
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
Unescape View File

@ -20,6 +20,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A; import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.cache.CacheProperties;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletInputStream; import javax.servlet.ServletInputStream;
@ -124,10 +126,16 @@ public class YunguanInterfaceController {
queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR3")) ? null : jsonObject.get("ATTR3").toString()); queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR3")) ? null : jsonObject.get("ATTR3").toString());
List<OrganizeEntity> orgList = organizeService.list(queryWrapper); List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
if(orgList != null && orgList.size() > 0){ if(orgList != null && orgList.size() > 0){
List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); List<String> conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(","));
String organizeId = JSON.toJSONString(conpanyIdList); String organizeId = JSON.toJSONString(conpanyIdList);
entity.setOrganizeJsonId(organizeId);//分支机构编码 entity.setOrganizeJsonId(organizeId);//分支机构编码
} }
QueryWrapper<OrganizeEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR1")) ? null : jsonObject.get("ATTR1").toString());
List<OrganizeEntity> companyId = organizeService.list(queryWrapper);
if (companyId != null && companyId.size() > 0) {
entity.setCompanyId(companyId.get(0).getId());//公司id
}
entity.setReservedFields1(ObjectUtil.isEmpty(jsonObject.get("ACCOUNT_TYPE")) ? null : jsonObject.get("ACCOUNT_TYPE").toString());//账户类型 entity.setReservedFields1(ObjectUtil.isEmpty(jsonObject.get("ACCOUNT_TYPE")) ? null : jsonObject.get("ACCOUNT_TYPE").toString());//账户类型
entity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("CLIENT_CLASSIFY")) ? null : jsonObject.get("CLIENT_CLASSIFY").toString());//客户类型 entity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("CLIENT_CLASSIFY")) ? null : jsonObject.get("CLIENT_CLASSIFY").toString());//客户类型
entity.setCountry(ObjectUtil.isEmpty(jsonObject.get("COUNTRY")) ? null : jsonObject.get("COUNTRY").toString());//国家 entity.setCountry(ObjectUtil.isEmpty(jsonObject.get("COUNTRY")) ? null : jsonObject.get("COUNTRY").toString());//国家
@ -153,6 +161,7 @@ public class YunguanInterfaceController {
}else { }else {
//新增客户 //新增客户
SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity(); SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity();
subjectbasicEntity.setCollaborationMethod("1");
subjectbasicEntity.setId(ObjectUtil.isEmpty(jsonObject.get("ID")) ? null : jsonObject.get("ID").toString());//ID subjectbasicEntity.setId(ObjectUtil.isEmpty(jsonObject.get("ID")) ? null : jsonObject.get("ID").toString());//ID
subjectbasicEntity.setName(ObjectUtil.isEmpty(jsonObject.get("CUST_FULL_NAME")) ? null : jsonObject.get("CUST_FULL_NAME").toString());//名称 subjectbasicEntity.setName(ObjectUtil.isEmpty(jsonObject.get("CUST_FULL_NAME")) ? null : jsonObject.get("CUST_FULL_NAME").toString());//名称
subjectbasicEntity.setCalssify("1");//一级 subjectbasicEntity.setCalssify("1");//一级
@ -171,10 +180,16 @@ public class YunguanInterfaceController {
queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR3")) ? null : jsonObject.get("ATTR3").toString()); queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR3")) ? null : jsonObject.get("ATTR3").toString());
List<OrganizeEntity> orgList = organizeService.list(queryWrapper); List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
if (orgList != null && orgList.size() > 0) { if (orgList != null && orgList.size() > 0) {
List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); List<String> conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(","));
String organizeId = JSON.toJSONString(conpanyIdList); String organizeId = JSON.toJSONString(conpanyIdList);
subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码 subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码
} }
QueryWrapper<OrganizeEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR1")) ? null : jsonObject.get("ATTR1").toString());
List<OrganizeEntity> companyId = organizeService.list(queryWrapper);
if (companyId != null && companyId.size() > 0) {
subjectbasicEntity.setCompanyId(companyId.get(0).getId());//公司id
}
subjectbasicEntity.setReservedFields1(ObjectUtil.isEmpty(jsonObject.get("ACCOUNT_TYPE")) ? null : jsonObject.get("ACCOUNT_TYPE").toString());//账户类型 subjectbasicEntity.setReservedFields1(ObjectUtil.isEmpty(jsonObject.get("ACCOUNT_TYPE")) ? null : jsonObject.get("ACCOUNT_TYPE").toString());//账户类型
subjectbasicEntity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("CLIENT_CLASSIFY")) ? null : jsonObject.get("CLIENT_CLASSIFY").toString());//客户类型 subjectbasicEntity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("CLIENT_CLASSIFY")) ? null : jsonObject.get("CLIENT_CLASSIFY").toString());//客户类型
if (ObjectUtil.isNotEmpty(jsonObject.get("COUNTRY"))){ if (ObjectUtil.isNotEmpty(jsonObject.get("COUNTRY"))){
@ -243,9 +258,10 @@ public class YunguanInterfaceController {
queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ORG_ID")) ? null : jsonObject.get("ORG_ID").toString()); queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ORG_ID")) ? null : jsonObject.get("ORG_ID").toString());
List<OrganizeEntity> orgList = organizeService.list(queryWrapper); List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
if(orgList != null && orgList.size() > 0){ if(orgList != null && orgList.size() > 0){
List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); List<String> conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(","));
String organizeId = JSON.toJSONString(conpanyIdList); String organizeId = JSON.toJSONString(conpanyIdList);
entity.setOrganizeJsonId(organizeId);//分支机构编码 entity.setOrganizeJsonId(organizeId);//分支机构编码
entity.setCompanyId(orgList.get(0).getId());//公司id
} }
entity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("VENDOR_TYPE")) ? null : jsonObject.get("VENDOR_TYPE").toString()); entity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("VENDOR_TYPE")) ? null : jsonObject.get("VENDOR_TYPE").toString());
entity.setCountry(ObjectUtil.isEmpty(jsonObject.get("COUNTRY")) ? null : jsonObject.get("COUNTRY").toString());//国家 entity.setCountry(ObjectUtil.isEmpty(jsonObject.get("COUNTRY")) ? null : jsonObject.get("COUNTRY").toString());//国家
@ -269,6 +285,7 @@ public class YunguanInterfaceController {
}else { }else {
//新增供应商 //新增供应商
SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity(); SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity();
subjectbasicEntity.setCollaborationMethod("1");
subjectbasicEntity.setId(ObjectUtil.isEmpty(jsonObject.get("ID")) ? null : jsonObject.get("ID").toString());//ID subjectbasicEntity.setId(ObjectUtil.isEmpty(jsonObject.get("ID")) ? null : jsonObject.get("ID").toString());//ID
subjectbasicEntity.setName(ObjectUtil.isEmpty(jsonObject.get("VENDOR_NAME")) ? null : jsonObject.get("VENDOR_NAME").toString());//名称 subjectbasicEntity.setName(ObjectUtil.isEmpty(jsonObject.get("VENDOR_NAME")) ? null : jsonObject.get("VENDOR_NAME").toString());//名称
subjectbasicEntity.setCalssify("1");//一级 subjectbasicEntity.setCalssify("1");//一级
@ -287,9 +304,10 @@ public class YunguanInterfaceController {
queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ORG_ID")) ? null : jsonObject.get("ORG_ID").toString()); queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ORG_ID")) ? null : jsonObject.get("ORG_ID").toString());
List<OrganizeEntity> orgList = organizeService.list(queryWrapper); List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
if (orgList != null && orgList.size() > 0) { if (orgList != null && orgList.size() > 0) {
List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); List<String> conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(","));
String organizeId = JSON.toJSONString(conpanyIdList); String organizeId = JSON.toJSONString(conpanyIdList);
subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码 subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码
entity.setCompanyId(orgList.get(0).getId());//公司id
} }
subjectbasicEntity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("VENDOR_TYPE")) ? null : jsonObject.get("VENDOR_TYPE").toString());//供应商类型 subjectbasicEntity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("VENDOR_TYPE")) ? null : jsonObject.get("VENDOR_TYPE").toString());//供应商类型
if (ObjectUtil.isNotEmpty(jsonObject.get("COUNTRY"))){ if (ObjectUtil.isNotEmpty(jsonObject.get("COUNTRY"))){
@ -348,10 +366,13 @@ public class YunguanInterfaceController {
//库存组织编码,库存组织名称 //库存组织编码,库存组织名称
if(ObjectUtil.isNotEmpty(jsonObject.get("ORG_CD"))){ if(ObjectUtil.isNotEmpty(jsonObject.get("ORG_CD"))){
contractLEntity.setKucunOrgCode(jsonObject.get("ORG_CD").toString()); contractLEntity.setKucunOrgCode(jsonObject.get("ORG_CD").toString());
DictionaryyunguandataEntity dictionaryyunguandataEntity = dictionaryyunguandataService.getDateValueInfo("564773000885326917",contractLEntity.getKucunOrgCode()); // DictionaryyunguandataEntity dictionaryyunguandataEntity = dictionaryyunguandataService.getDateValueInfo("564773000885326917",contractLEntity.getKucunOrgCode());
if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity)) { // if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity)) {
contractLEntity.setKucunOrgName(dictionaryyunguandataEntity.getZhihuiValue()); // contractLEntity.setKucunOrgName(dictionaryyunguandataEntity.getZhihuiValue());
// }
} }
if (ObjectUtil.isNotEmpty(jsonObject.get("ORG_NM"))){
contractLEntity.setKucunOrgName(jsonObject.get("ORG_NM").toString());
} }
//组织，公司，部门，签约主体 //组织，公司，部门，签约主体
if(ObjectUtil.isNotEmpty(jsonObject.get("DEPT_CD"))){ if(ObjectUtil.isNotEmpty(jsonObject.get("DEPT_CD"))){
@ -359,7 +380,7 @@ public class YunguanInterfaceController {
queryWrapper.lambda().eq(OrganizeEntity::getEnCode, jsonObject.get("DEPT_CD").toString()); queryWrapper.lambda().eq(OrganizeEntity::getEnCode, jsonObject.get("DEPT_CD").toString());
List<OrganizeEntity> orgList = organizeService.list(queryWrapper); List<OrganizeEntity> orgList = organizeService.list(queryWrapper);
if(orgList != null && orgList.size() > 0){ if(orgList != null && orgList.size() > 0){
List<String> conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); List<String> conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(","));
String organizeId = JSON.toJSONString(conpanyIdList); String organizeId = JSON.toJSONString(conpanyIdList);
contractLEntity.setDepartmentId(orgList.get(0).getId()); contractLEntity.setDepartmentId(orgList.get(0).getId());
contractLEntity.setCompanyId(orgList.get(0).getParentId()); contractLEntity.setCompanyId(orgList.get(0).getParentId());
@ -826,6 +847,12 @@ public class YunguanInterfaceController {
businessOrderProductRelationalEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE()); businessOrderProductRelationalEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity); businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity);
} }
if (yunguanPurchaseOrderProductModel.getREAD_FLAG().equals("N")){
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderProductModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderProductModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
} }
} }
} else if (jsonObject.get("TYPE").equals("销售订单头")) { } else if (jsonObject.get("TYPE").equals("销售订单头")) {
@ -858,6 +885,12 @@ public class YunguanInterfaceController {
businessOrderProductRelationalEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE()); businessOrderProductRelationalEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity); businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity);
} }
if (yunguanSaleOrderProductModel.getREAD_FLAG().equals("N")){
businessOrderEntity.setYunguanMark(yunguanSaleOrderProductModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanSaleOrderProductModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
} }
} }
} else if (jsonObject.get("TYPE").equals("采购入库")) { } else if (jsonObject.get("TYPE").equals("采购入库")) {
@ -894,19 +927,24 @@ public class YunguanInterfaceController {
} }
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>(); QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId()); warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN()); warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*",""));
WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper); WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){ if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){
warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageProductService.updateById(warehousingStorageProductEntity); warehousingStorageProductService.updateById(warehousingStorageProductEntity);
} if (StringUtils.isEmpty(warehousingStorageEntity.getYunguanMark())){
if (yunguanPurchaseInBoundModel.getREAD_FLAG().equals("N")){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity); warehousingStorageService.updateById(warehousingStorageEntity);
} else if (warehousingStorageEntity.getYunguanMark().equals("Y")) {
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
} }
} }
} }
@ -926,10 +964,16 @@ public class YunguanInterfaceController {
warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundProductService.updateById(warehousingOutboundProductEntity); warehousingOutboundProductService.updateById(warehousingOutboundProductEntity);
if (!warehousingOutboundEntity.getYunguanMark().equals("N")){ if (StringUtils.isEmpty(warehousingOutboundEntity.getYunguanMark())){
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundService.updateById(warehousingOutboundEntity);
}else if(warehousingOutboundEntity.getYunguanMark().equals("Y")){
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG()); warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundService.updateById(warehousingOutboundEntity);
} }
} }
} }
@ -964,6 +1008,12 @@ public class YunguanInterfaceController {
cwsettlementsummaryEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE()); cwsettlementsummaryEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
cwsettlementsummaryService.updateById(cwsettlementsummaryEntity); cwsettlementsummaryService.updateById(cwsettlementsummaryEntity);
} }
if (yunguanPurchaseSettlementProductModel.getREAD_FLAG().equals("N")){
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementProductModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementProductModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
} }
} }
} else if (jsonObject.get("TYPE").equals("销售结算头")) { } else if (jsonObject.get("TYPE").equals("销售结算头")) {
@ -986,9 +1036,12 @@ public class YunguanInterfaceController {
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementProductModel.getINVOICE_NO()); cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementProductModel.getINVOICE_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper); CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){ if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
if (StringUtils.isNotEmpty(yunguanSaleSettlementProductModel.getATTRIBUTE4())) {
int index = yunguanSaleSettlementProductModel.getATTRIBUTE4().lastIndexOf("-");
String lineNo = yunguanSaleSettlementProductModel.getATTRIBUTE4().substring(index + 1).replaceFirst("^0*","");
QueryWrapper<CwsettlementsummaryEntity> cwsettlementsummaryQueryWrapper = new QueryWrapper<>(); QueryWrapper<CwsettlementsummaryEntity> cwsettlementsummaryQueryWrapper = new QueryWrapper<>();
cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId, cwsettlementEntity.getId()); cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId, cwsettlementEntity.getId());
cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getLineNo,yunguanSaleSettlementProductModel.getATTRIBUTE4()); cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getLineNo, lineNo);
CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(cwsettlementsummaryQueryWrapper); CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(cwsettlementsummaryQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)) { if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)) {
cwsettlementsummaryEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG()); cwsettlementsummaryEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG());
@ -996,6 +1049,13 @@ public class YunguanInterfaceController {
cwsettlementsummaryEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE()); cwsettlementsummaryEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
cwsettlementsummaryService.updateById(cwsettlementsummaryEntity); cwsettlementsummaryService.updateById(cwsettlementsummaryEntity);
} }
if (yunguanSaleSettlementProductModel.getREAD_FLAG().equals("N")) {
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
}
} }
} }
} else if (jsonObject.get("TYPE").equals("生产加工")) { } else if (jsonObject.get("TYPE").equals("生产加工")) {
@ -1005,30 +1065,39 @@ public class YunguanInterfaceController {
workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO()); workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO());
WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper); WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper);
if (ObjectUtil.isNotEmpty(workOrderEntity)){ if (ObjectUtil.isNotEmpty(workOrderEntity)){
QueryWrapper<ProductWarehouseEntity> productQueryWrapper = new QueryWrapper<>(); // QueryWrapper<ProductWarehouseEntity> productQueryWrapper = new QueryWrapper<>();
productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD()); // productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper); // productQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark);
// ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper);
if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("投入")){ if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("投入")){
QueryWrapper<WorkOrderPrimaryEntity> workOrderPrimaryQueryWrapper = new QueryWrapper<>(); QueryWrapper<WorkOrderPrimaryEntity> workOrderPrimaryQueryWrapper = new QueryWrapper<>();
workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId()); workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId());
workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getProductId,productWarehouseEntity.getId()); workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getCode,yunguanProductProcessModel.getITEM_CD());
WorkOrderPrimaryEntity workOrderPrimaryEntity = workOrderPrimaryService.getOne(workOrderPrimaryQueryWrapper); WorkOrderPrimaryEntity workOrderPrimaryEntity = workOrderPrimaryService.getOne(workOrderPrimaryQueryWrapper);
if (ObjectUtil.isNotEmpty(workOrderPrimaryEntity)){ if (ObjectUtil.isNotEmpty(workOrderPrimaryEntity)){
workOrderPrimaryEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); workOrderPrimaryEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderPrimaryEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); workOrderPrimaryEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderPrimaryEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); workOrderPrimaryEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderPrimaryService.updateById(workOrderPrimaryEntity); workOrderPrimaryService.updateById(workOrderPrimaryEntity);
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderService.updateById(workOrderEntity);
} }
} else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) { } else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) {
QueryWrapper<WorkOrderProductEntity> workOrderProductQueryWrapper = new QueryWrapper<>(); QueryWrapper<WorkOrderProductEntity> workOrderProductQueryWrapper = new QueryWrapper<>();
workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId()); workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId());
workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getProductId,productWarehouseEntity.getId()); workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getCode,yunguanProductProcessModel.getITEM_CD());
WorkOrderProductEntity workOrderProductEntity = workOrderProductService.getOne(workOrderProductQueryWrapper); WorkOrderProductEntity workOrderProductEntity = workOrderProductService.getOne(workOrderProductQueryWrapper);
if (ObjectUtil.isNotEmpty(workOrderProductEntity)){ if (ObjectUtil.isNotEmpty(workOrderProductEntity)){
workOrderProductEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); workOrderProductEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderProductEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); workOrderProductEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderProductEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); workOrderProductEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderProductService.updateById(workOrderProductEntity); workOrderProductService.updateById(workOrderProductEntity);
workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderService.updateById(workOrderEntity);
} }
} }
} }

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanProductProcessModel.java
Unescape View File

@ -95,4 +95,7 @@ public class YunguanProductProcessModel {
/** ESB错误信息 **/ /** ESB错误信息 **/
@JSONField(name = "ESB_MESSAGE") @JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE; private String ESB_MESSAGE;
/** 部门编码 **/
@JSONField(name = "ADD_DEPT_CODE")
private String ADD_DEPT_CODE;
} }

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseSettlementModel.java
Unescape View File

@ -25,8 +25,8 @@ public class YunguanPurchaseSettlementModel {
private String ACCOUNT_NO; private String ACCOUNT_NO;
@JSONField(name = "VENDOR_CD") @JSONField(name = "VENDOR_CD")
private String VENDOR_CD; private String VENDOR_CD;
@JSONField(name = "VENDOR_NAME") @JSONField(name = "VENDOR_NM")
private String VENDOR_NAME; private String VENDOR_NM;
@JSONField(name = "VENDOR_SITE_CODE") @JSONField(name = "VENDOR_SITE_CODE")
private String VENDOR_SITE_CODE; private String VENDOR_SITE_CODE;
@JSONField(name = "ATTRIBUTE10") @JSONField(name = "ATTRIBUTE10")
@ -100,4 +100,6 @@ public class YunguanPurchaseSettlementModel {
private String ATTRIBUTE11; private String ATTRIBUTE11;
@JSONField(name = "INVOICE_AMOUNT") @JSONField(name = "INVOICE_AMOUNT")
private BigDecimal INVOICE_AMOUNT; private BigDecimal INVOICE_AMOUNT;
@JSONField(name = "LINE_SUM")
private Integer LINE_SUM;
} }

3
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java
Unescape View File

@ -107,4 +107,7 @@ public class YunguanSaleOutBoundModel {
/** ESB错误信息 **/ /** ESB错误信息 **/
@JSONField(name = "ESB_MESSAGE") @JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE; private String ESB_MESSAGE;
/** 采购订单号-行号 **/
@JSONField(name = "PUR_ORDER")
private String PUR_ORDER;
} }

Write Preview
Loading…
Cancel
Save