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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml
#	jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
#	jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java
#	jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
jg-waiwang-pro
胡川虎 3 months ago
parent 546e28cfc0 1c25f3c4b0
commit 24490b5b64
64 changed files with 2794 additions and 802 deletions
Show Stats Download Patch File Download Diff File

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

@ -31,6 +31,8 @@
<result column="is_long_agreement" property="isLongAgreement"/>
<result column="input_tax_rate" property="inputTaxRate"/>
<result column="output_tax_rate" property="outputTaxRate"/>
<result column="businessName" property="businessName"/>
</resultMap>
<resultMap id="saleOrder" type="jnpf.entity.BusinessOrderEntity">
@ -97,7 +99,9 @@
<result column="realName" property="realName"/>
<result column="realNameA" property="realNameA"/>
<result column="taxCount" property="taxCount"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
</resultMap>
<resultMap id="purchaseOrder" type="jnpf.entity.BusinessOrderEntity">
@ -167,6 +171,9 @@
<result column="purchaseStatus" property="purchaseStatus"/>
<result column="wareHouseName" property="wareHouseName"/>
<result column="addressName" property="addressName"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
</resultMap>
<resultMap id="contractInfo" type="jnpf.model.businessorder.ContractModel">
@ -243,7 +250,8 @@
b.name AS firstCustomName,
c.f_full_name AS enterpriseName,
d.contract_name AS relatedContractName,
e.name AS secondCustomName
e.name AS secondCustomName,
h.name AS businessName
FROM
jg_contract a
LEFT JOIN jg_subject_basic b ON a.subject = b.id
@ -255,6 +263,7 @@
LEFT JOIN jg_subject_basic e ON a.subject2 = e.id
AND e.f_delete_mark IS NULL
LEFT JOIN flow_task g ON a.id = g.f_process_id and g.f_delete_mark is null
LEFT JOIN jg_business_line h ON a.business_id=h.id AND h.f_delete_mark IS NULL
WHERE
a.contract_type = '2'
AND (a.business_id = #{businessLineId} or a.business_id is null)
@ -272,7 +281,8 @@
c.f_full_name AS enterpriseName,
d.contract_name AS relatedContractName,
e.name AS secondSupplyName,
f.name AS thirdSupplyName
f.name AS thirdSupplyName,
h.name AS businessName
FROM
jg_contract a
LEFT JOIN jg_subject_basic b ON a.subject = b.id
@ -286,6 +296,7 @@
LEFT JOIN jg_subject_basic f ON a.subject3 = f.id
AND f.f_delete_mark IS NULL
LEFT JOIN flow_task g ON a.id = g.f_process_id and g.f_delete_mark is null
LEFT JOIN jg_business_line h ON a.business_id=h.id AND h.f_delete_mark IS NULL
WHERE
a.contract_type = '1'
AND a.business_id = #{businessLineId}
@ -296,6 +307,43 @@
AND g.f_status = 2
</select>
<select id="queryBusinessContract" resultMap="contractList">
SELECT
a.*,
b.name AS firstSupplyName,
c.f_full_name AS enterpriseName,
d.contract_name AS relatedContractName,
e.name AS secondSupplyName,
f.name AS thirdSupplyName,
h.name AS businessName
FROM
jg_contract a
LEFT JOIN jg_subject_basic b ON a.subject = b.id
AND b.f_delete_mark IS NULL
LEFT JOIN base_organize c ON a.dept_id = c.f_id
AND c.f_delete_mark IS NULL
LEFT JOIN jg_contract d ON a.related_contract_id = d.id
AND d.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic e ON a.subject2 = e.id
AND e.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic f ON a.subject3 = f.id
AND f.f_delete_mark IS NULL
LEFT JOIN flow_task g ON a.id = g.f_process_id and g.f_delete_mark is null
LEFT JOIN jg_business_line h ON a.business_id=h.id AND h.f_delete_mark IS NULL
WHERE
a.contract_type = '1'
AND a.business_id = #{businessLine}
AND a.contract_number = #{contractNumber}
AND DATE_FORMAT( a.contract_period_time, '%Y-%m-%d' ) &lt;= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
AND DATE_FORMAT( a.contract_period_time_end, '%Y-%m-%d' ) &gt;= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
AND a.f_delete_mark IS NULL
AND a.organize_json_id like concat('%',#{organize},'%')
AND g.f_status = 2
</select>
<select id="querySaleOrder" resultMap="saleOrder">
SELECT
a.*,
@ -848,19 +896,19 @@
CASE
b.payment_method
WHEN '1' THEN
'现金'
'A'
WHEN '2' THEN
'现金'
'A'
WHEN '3' THEN
'现金'
'A'
WHEN '4' THEN
'承兑'
'B'
WHEN '5' THEN
'现金'
'A'
WHEN '6' THEN
'现金'
'A'
WHEN '7' THEN
'现金'
'A'
END AS PAY_MTH,
g.yunguan_value AS TRANS_TYPE,
CASE
@ -887,7 +935,8 @@
'N' as ESB_STATUS,
null as ESB_DTM,
'' as ESB_MESSAGE,
count(h.id) as LINE_SUM
count(h.id) as LINE_SUM,
IF ( LOCATE( '贸易', i.NAME ) > 0, '11', '50' ) AS ORD_TY
FROM
jg_business_order a
LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
@ -904,6 +953,8 @@
AND g.f_delete_mark IS NULL AND g.type_id = '565504934695425285'
LEFT JOIN jg_business_order_product_relational h ON h.business_order_id = a.id
AND h.f_delete_mark IS NULL
LEFT JOIN jg_business_line i ON a.business_line_id = i.id
AND i.f_delete_mark IS NULL
WHERE a.f_delete_mark is null and a.id = #{id}
</select>
@ -912,7 +963,7 @@
b.id AS ID,
c.f_en_code AS COMP_CD,
a.CODE AS ORD_NO,
b.ord_ln as ORD_LN,
LPAD(b.ord_ln,2,0) as ORD_LN,
d.CODE AS ITEM_CD,
d.NAME AS ITEM_NM,
d.spec AS SPEC_TYPE,
@ -970,7 +1021,7 @@
c.f_en_code AS COMP_CD,
f.kucun_org_code AS ORG_ID,
f.kucun_org_name AS ORG_NM,
d.f_id as DEPARTMENT_CD,
d.f_en_code as DEPARTMENT_CD,
d.f_en_code AS ADD_DEPT_CODE,
d.f_full_name AS ADD_DEPT_NAME,
a.CODE AS ORD_NO,
@ -1012,19 +1063,19 @@
CASE
b.payment_method
WHEN '1' THEN
'现金'
'A'
WHEN '2' THEN
'现金'
'A'
WHEN '3' THEN
'现金'
'A'
WHEN '4' THEN
'承兑'
'B'
WHEN '5' THEN
'现金'
'A'
WHEN '6' THEN
'现金'
'A'
WHEN '7' THEN
'现金'
'A'
END AS PAY_MTH,
f.total_amount AS CONTR_PRICE,
g.full_address AS FROM_PLACE,
@ -1042,8 +1093,12 @@
a.f_creator_time as ORD_REG_DTM,
e.f_real_name AS CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM,
j.f_real_name as MODIFY_EMP_ID,
a.f_last_modify_time as MODIFY_DTM,
a.f_last_modify_time as ORD_CONF_DTM,
'0' as CANCLE_YN,
IF ( LOCATE( '贸易', h.NAME ) > 0, '11', '50' ) AS ORD_TY
IF ( LOCATE( '贸易', h.NAME ) > 0, '11', '50' ) AS ORD_TY,
count(i.id) as LINE_SUM
FROM
jg_business_order a
LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id
@ -1060,6 +1115,10 @@
AND g.f_delete_mark IS NULL
LEFT JOIN jg_business_line h ON a.business_line_id = h.id
AND h.f_delete_mark IS NULL
LEFT JOIN jg_business_order_product_relational i ON i.business_order_id = a.id
AND i.f_delete_mark IS NULL
LEFT JOIN base_user j ON a.f_last_modify_user_id = j.f_id
AND j.f_delete_mark is null
WHERE a.f_delete_mark IS NULL AND a.id = #{id}
</select>
@ -1067,9 +1126,9 @@
SELECT
b.id AS ID,
c.f_en_code AS COMP_CD,
g.f_id as DEPARTMENT_CD,
g.f_en_code as DEPARTMENT_CD,
a.CODE AS ORD_NO,
b.ord_ln as ORD_LN,
LPAD(b.ord_ln,3,0) as LINE_NO,
'' as CONTR_LINE_ID,
'B' AS ORD_STS,
d.CODE AS ITEM_CD,
@ -1080,8 +1139,8 @@
b.business_price AS ORD_PRICE,
b.tax_count AS TOT_AMOUNT,
b.tax AS TAX_RATE_CODE,
f.tax_rate_code as TAX_RATE,
(IFNULL(b.tax_count,0) - IFNULL(b.not_tax_count,0)) as TAX_AMOUNT
CONCAT('VAT_OUT_',b.tax) as TAX_RATE,
(IFNULL(CAST(b.tax_count AS DECIMAL(32,2)),0) - IFNULL(CAST(b.not_tax_count AS DECIMAL(32,2)),0)) as TAX_AMOUNT,
b.not_tax_price AS TAX_PRICE,
b.not_tax_count AS AMOUNT,
f.delv_tol_max as DELV_TOL_MAX,
@ -1111,7 +1170,7 @@
AND f.f_delete_mark IS NULL
LEFT JOIN base_organize g ON a.department_id = g.f_id
AND g.f_delete_mark IS NULL
LEFT JOIN base_user h ON a.f_creator_user_id = h.id AND h.f_delete_mark is null
LEFT JOIN base_user h ON a.f_creator_user_id = h.f_id AND h.f_delete_mark is null
WHERE a.f_delete_mark IS NULL AND a.id = #{id}
</select>

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

@ -40,7 +40,7 @@
LEFT JOIN base_user i ON i.f_Id = a.f_creator_user_id
AND i.f_delete_mark
IS NULL LEFT JOIN base_user i1 ON i1.f_Id = a.f_last_modify_user_id
AND i1.f_delete_mark
AND i1.f_delete_mark IS NULL
${ew.customSqlSegment}
GROUP BY
a.id

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

@ -365,7 +365,6 @@
a.ord_ln ordLn,
c.code businessCode,
d.document_no docmentNo,
f.cargo_name warehouseName,
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product where product_id = a.product_id and warehousing_outbound_id = d.id and ord_ln = a.ord_ln) storageNumber
FROM
jg_business_order_product_relational a

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

@ -34,6 +34,9 @@
<result column="realName" property="realName"/>
<result column="realNameA" property="realNameA"/>
<result column="settlement_sum" property="settlementSum"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
</resultMap>
<select id="queryCwsettlement" resultMap="cwsettlement">

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

@ -157,6 +157,72 @@
</if>
</select>
<select id="getProductWorkList" resultMap="getProductWarehouseMap">
SELECT
a.*,
a.id AS productId,
CASE
inventory_type
WHEN 1 THEN
'原材料'
WHEN 2 THEN
'半成品'
WHEN 3 THEN
'产成品'
END AS inventoryTypes,
CASE
product_type_id
WHEN 1 THEN
'实物商品'
WHEN 2 THEN
'虚拟商品'
WHEN 3 THEN
'设备/器材'
WHEN 4 THEN
'耗材/辅材'
END AS productTypeIds,
CASE
product_type_id
WHEN 1 THEN
'实物商品'
WHEN 2 THEN
'虚拟商品'
WHEN 3 THEN
'设备/器材'
WHEN 4 THEN
'耗材/辅材'
END AS productTypeId,
IF
(
many_unit_flag = 1,
JgFnUnitArrName ( order_main_unit_id ),
JgFnUnitArrName ( order_main_unit_id )) AS orderMainUnitIds,
order_main_unit_id AS orderMainUnitId,
purchase_order_quantity_down as purchaseOrderQuantityDowns,
purchase_order_quantity_upper as purchaseOrderQuantityUppers,
purchase_order_multiple as purchaseOrderMultiples,
IF
(
many_unit_flag = 1,
JgFnUnitArrName ( sales_main_unit_id ),
JgFnUnitArrName ( sales_main_unit_id )) AS salesMainUnitIds,
sales_order_quantity_down as salesOrderQuantityDowns,
sales_order_quantity_upper as salesOrderQuantityUppers,
sales_order_multiple as salesOrderMultiples,
JgFnUnitName ( inventory_unit_id ) AS inventoryUnitIds,
JgFnUnitName ( inventory_unit_id ) AS unitId,
JgFnUnitName ( operate_unit_id ) AS operateUnitIds,
operate_unit_id AS operateUnitId
FROM
jg_product a
${ew.customSqlSegment}
</select>
<select id="getProductByVoucher" resultMap="getProductWarehouseMap">
SELECT
*,

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

@ -719,6 +719,22 @@
b.id= #{id}
</select>
<select id="queryVoucherByBusinessOrder2" resultType="java.math.BigDecimal">
SELECT
IFNULL( round( sum( a.purchase_amount ), 2 ), 0 ) AS purchaseAmount
FROM
jg_voucher a
LEFT JOIN jg_voucher_product b ON a.id = b.voucher_id
AND b.f_delete_mark
IS NULL LEFT JOIN jg_voucher c ON a.voucher_relation = c.id
AND c.f_delete_mark
WHERE
a.f_delete_mark IS NULL
AND a.is_transfer = '2'
AND a.business_order_id = #{id}
</select>
<select id="queryAmountByBusinessOrder" resultType="java.util.Map">
select
IFNULL(SUM(a.sale_amount), 0 ) AS saleAmount,

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

@ -21,6 +21,9 @@
<result column="realName" property="realName"/>
<result column="realNameA" property="realNameA"/>
<result column="outNumber" property="outNumber"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
</resultMap>
@ -120,23 +123,23 @@
<select id="saleOutBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
SELECT
a.id AS OUT_ID,
e.f_id as COMP_ID,
e.f_en_code AS COMP_CD,
e.f_en_code AS COMP_ID,
f.f_en_code AS DEPT_ID,
a.document_no AS PROD_ZL,
aa.order_line as CK_ORDER,
IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
d.CODE AS CUS_ID,
d.NAME AS CUS_NAME,
i.NAME AS STORE_ID,
IF(a.warehousing_outbound_type = 1,d.code,q.code) as CUS_ID,
IF(a.warehousing_outbound_type = 1,d.name,q.name) as CUS_NAME,
i.cargo_name AS STORE_ID,
a.warehousing_time as OUT_DTM,
a.remark as REMARKS,
j.CODE AS MAT_ID,
j.NAME AS MAT_NAME,
j.spec AS SPECIFICATION,
aa.spec AS SPECIFICATION,
aa.outbound_unit AS UNIT,
aa.outbound_number AS OUT_QUANTITY,
'1' as OUT_FLAG,
s.contract_no as contract_no,
g.f_real_name as CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM,
k.f_real_name as MODIFY_EMP_ID,
@ -149,25 +152,29 @@
'N' as ESB_STATUS,
null as ESB_DTM,
'' as ESB_MESSAGE,
IF(a.warehousing_outbound_type = 1,n.ord_ln,o.ord_ln) 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
FROM
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
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_subject_basic d ON c.first_subject_basic_id = d.id AND b.f_delete_mark IS NULL
LEFT JOIN base_organize e ON a.company_id = e.f_id AND c.f_delete_mark IS NULL
LEFT JOIN base_organize f ON a.department_id = f.f_id AND d.f_delete_mark IS NULL
LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND e.f_delete_mark IS NULL
LEFT JOIN jg_contract h ON c.contract_id = h.id AND f.f_delete_mark IS NULL
LEFT JOIN jg_business_line i ON a.warehouse_id = i.id AND i.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 base_organize e ON a.company_id = e.f_id AND e.f_delete_mark IS NULL
LEFT JOIN base_organize f ON a.department_id = f.f_id AND f.f_delete_mark IS NULL
LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND g.f_delete_mark IS NULL
LEFT JOIN jg_contract h ON c.contract_id = h.id AND h.f_delete_mark IS NULL
LEFT JOIN jg_business_cargo i ON aa.outbound_area_id = i.id AND i.f_delete_mark IS NULL
LEFT JOIN jg_product j ON aa.product_id = j.id AND j.f_delete_mark is null
LEFT JOIN base_user k ON a.f_last_modify_user_id = k.f_id AND k.f_delete_mark IS NULL
LEFT JOIN jg_delivery_order l on a.warehousing_id = l.id and l.f_delete_mark is null
LEFT JOIN jg_business_order m on l.business_id = m.id and m.f_delete_mark is null
LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id and aa.ord_ln = n.ord_ln
LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = n.ord_ln
LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = o.ord_ln
LEFT JOIN jg_contract p ON m.contract_id = p.id AND p.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic q ON m.first_subject_basic_id = q.id AND q.f_delete_mark IS NULL
LEFT JOIN jg_business_order r ON a.business_order_no = r.code AND r.f_delete_mark is null
LEFT JOIN jg_contract s ON r.contract_id = s.id AND s.f_delete_mark is null
WHERE
a.f_delete_mark is null
AND a.id = #{id}

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

@ -21,6 +21,9 @@
<result column="realNameA" property="realNameA"/>
<result column="realityNumber" property="realityNumber"/>
<result column="business_order_no" property="businessOrderNo"/>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
</resultMap>
<select id="queryWarehousingStorageList" resultMap="getWarehousingStorageMap">
@ -353,8 +356,8 @@
SELECT
a.id AS ID,
e.f_en_code AS COMP_CD,
IF(a.warehousing_storage_type = '1',h.kucun_org_code,m.kucun_org_code) AS INV_ORG_CD,
IF(a.warehousing_storage_type = '1',h.kucun_org_name,m.kucun_org_name) AS INV_ORG_NM,
IF(a.warehousing_storage_type = '1',h.kucun_org_code,q.kucun_org_code) AS INV_ORG_CD,
IF(a.warehousing_storage_type = '1',h.kucun_org_name,q.kucun_org_name) AS INV_ORG_NM,
f.f_en_code AS DEPT_CD,
f.f_full_name AS DEPT_NM,
g.f_id as ADD_CODE,
@ -366,24 +369,12 @@
a.warehousing_time AS RECEIPT_DTM,
IF(a.warehousing_storage_type = '1',c.code,l.code) as ORD_NO,
aa.ord_ln as ORD_LN,
IF(a.warehousing_storage_type = '1',h.contract_number,m.contract_number) AS CON_CD,
IF(a.warehousing_storage_type = '1',h.contract_no,m.contract_no) AS CON_NO,
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',d.code,p.code) AS SUPPLIER_CD,
IF(a.warehousing_storage_type = '1',d.name,p.name) AS SUPPLIER_NM,
i.NAME AS STO_NM,
CASE
a.warehousing_storage_status
WHEN '1' THEN
'待提交'
WHEN '2' THEN
'待审核'
WHEN '3' THEN
'已入库'
WHEN '4' THEN
'已驳回'
WHEN '5' THEN
'已关闭'
END AS STO_STS,
r.cargo_name AS STO_NM,
'2' AS STO_STS,
j.CODE AS ITEM_CD,
j.NAME AS ITEM_NM,
CASE
@ -404,7 +395,7 @@
a.warehousing_time AS STO_DTM,
o.f_real_name as STO_CONFIRM_ID,
a.f_last_modify_time as STO_CONFIRM_DTM,
'' as STO_FLAG,
'1' as STO_FLAG,
'N' as READ_FLAG,
null as READ_TIME,
'' as ERR_MESSAGE,
@ -429,13 +420,14 @@
AND m.f_delete_mark IS NULL
LEFT JOIN jg_receipt_order k on a.warehousing_id = k.id and k.f_delete_mark is null
LEFT JOIN jg_business_order l on k.business_id = l.id and l.f_delete_mark is null
LEFT JOIN jg_contract m ON l.contract_id = m.id AND m.f_delete_mark IS NULL
LEFT JOIN jg_contract q ON l.contract_id = q.id AND q.f_delete_mark IS NULL
LEFT JOIN jg_business_order_product_relational n ON l.id = n.business_order_id
AND aa.product_id = n.product_id
AND aa.storage_unit = n.sales_main_unit_id
AND n.f_delete_mark IS NULL
LEFT JOIN base_user o ON a.f_last_modify_user_id = o.f_id AND o.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic p ON l.first_subject_basic_id = p.id AND p.f_delete_mark IS NULL
LEFT JOIN jg_business_cargo r ON aa.storage_area_id = r.id AND r.f_delete_mark is null
WHERE
a.f_delete_mark is null
AND a.id = #{id}

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

@ -41,6 +41,9 @@
<result column="f_last_modify_user_id" property="lastModifyUserId"></result>
<result column="realName" property="realName"></result>
<result column="productName" property="productName"></result>
<result column="yunguan_mark" property="yunguanMark"/>
<result column="yunguan_massage" property="yunguanMassage"/>
<result column="yunguan_time" property="yunguanTime"/>
</resultMap>
@ -160,11 +163,7 @@
'产出' as PRD_TY,
d.code as ITEM_CD,
d.name as ITEM_NM,
case
d.is_input
when '1' then '产品'
when '2' then '副产品'
end as PROD_TY,
'产品' as PROD_TY,
b.spec as SPEC_TYPE,
b.proportion_num as QUANTITY,
a.work_time as PRD_DATE,
@ -175,7 +174,14 @@
a.code as TASK_NM,
b.batch_number as BATCH_ID,
'已完成' 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.name as ATTR3,
h.f_real_name as CREATE_EMP_ID,
@ -190,13 +196,11 @@
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_business_line e on a.business_id = e.id and e.f_delete_mark is null
left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
left join base_user h on a.f_creator_user_id = h.f_id and h.f_delete_mark is null
left join jg_bom i on b.bom_id = i.id and i.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 base_organzie 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_business_cargo n on b.cargo_id = n.id and n.f_delete_mark is null
where a.f_delete_mark is null and a.id =#{id}
@ -208,7 +212,10 @@
m.yunguan_value as ORGANIZATION_CODE,
l.f_full_name as ORGANIZATION_NM,
a.code as TASK_NO,
'投入' as PRD_TY,
case c.is_input
when '1' then '原料'
when '2' then '副产品'
end as PRD_TY,
d.code as ITEM_CD,
d.name as ITEM_NM,
'原料' as PROD_TY,
@ -236,15 +243,13 @@
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
right join jg_work_order_primary c on a.id = c.work_id and c.f_delete_mark is null
left join jg_product d on a.product_id = d.id and d.f_delete_mark is null
left join jg_product d on c.product_id = d.id and d.f_delete_mark is null
left join jg_business_line e on a.business_id = e.id and e.f_delete_mark is null
left join jg_warehousing_storage f on a.id = f.warehousing_id and f.f_delete_mark is null
left join jg_warehousing_storage_product g on f.id = g.warehousing_storage_id and g.product_id = b.product_id and g.f_delete_mark is null
left join base_user h on a.f_creator_user_id = h.f_id and h.f_delete_mark is null
left join jg_bom i on b.bom_id = i.id and i.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 base_organzie 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_business_cargo n on c.cargo_id = n.id and n.f_delete_mark is null
where a.f_delete_mark is null and a.id =#{id}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/BusinessOrderMapper.java
Unescape View File

@ -79,4 +79,7 @@ public interface BusinessOrderMapper extends BaseMapper<BusinessOrderEntity> {
List<HashMap<String, Object>> getOrderInfo2(@Param("code") String code);
List<BusinessOrderEntity> getbusinessOrdLn(String id);
List<ContractLEntity> queryBusinessContract(@Param("businessLine") String businessLine,@Param("organize") String organize,@Param("contractNumber") String contractNumber);
}

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/ProductWarehouseMapper.java
Unescape View File

@ -2,9 +2,11 @@ package jnpf.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.entity.BomEntity;
import jnpf.entity.BusinessOrderEntity;
import jnpf.entity.ProductWarehouseEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.model.bom.BomPagination;
@ -35,4 +37,7 @@ public interface ProductWarehouseMapper extends BaseMapper<ProductWarehouseEntit
//盘点单根据库存盘点查询商品
IPage<ProductWarehouseEntity> queryProductInventoryList(@Param("page") Page<ProductWarehouseEntity> page, @Param("productWarehousePagination") ProductWarehousePagination productWarehousePagination, @Param("ew") Wrapper<ProductWarehouseEntity> productWarehouseQueryWrapper);
List<ProductWarehouseEntity> getProductWorkList(@Param("ew") QueryWrapper<ProductWarehouseEntity> queryWrapper);
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java
Unescape View File

@ -50,6 +50,8 @@ public interface VoucherMapper extends BaseMapper<VoucherEntity> {
VoucherEntity queryVoucherDetail(@Param("id") String id);
BigDecimal queryVoucherByBusinessOrder(@Param("id") String id);
BigDecimal queryVoucherByBusinessOrder1(@Param("id") String id); //查询订单利润
BigDecimal queryVoucherByBusinessOrder2(@Param("id") String id); //查询凭证采购额
Map<String ,BigDecimal> queryAmountByBusinessOrder(@Param("id") String id);

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/BusinessOrderService.java
Unescape View File

@ -102,4 +102,8 @@ public interface BusinessOrderService extends IService<BusinessOrderEntity> {
BigDecimal getSaleAmountSumInfo(String id);
List<BusinessOrderEntity> getordLn(String id);
//根据业务线带出合同
List<ContractLEntity> queryBusinessContractInfo(String businessLine,String contractNumber);
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/CwsettlementService.java
Unescape View File

@ -55,5 +55,9 @@ public interface CwsettlementService extends IService<CwsettlementEntity> {
String checkForm(CwsettlementForm form,int i);
void saveOrUpdate(CwsettlementForm cwsettlementForm,String id, boolean isSave) throws Exception;
boolean pushPurchaseLineYunguan(CwsettlementEntity cwsettlementEntity);
boolean pushPurchaseHeadYunguan(CwsettlementEntity cwsettlementEntity);
boolean pushSaleLineYunguan(CwsettlementEntity cwsettlementEntity);
boolean pushSaleHeadYunguan(CwsettlementEntity cwsettlementEntity);
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/ProductWarehouseService.java
Unescape View File

@ -58,4 +58,8 @@ public interface ProductWarehouseService extends IService<ProductWarehouseEntity
List<ProductWarehouseEntity> getProductInventoryList(ProductWarehousePagination productWarehousePagination);
List<ProductWarehouseEntity> getProductInventoryTypeList(ProductWarehousePagination productWarehousePagination,String dataType);
//加工成品查询
List<ProductWarehouseEntity> getWorkProductList(QueryWrapper<ProductWarehouseEntity> queryWrapper);
}

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java
Unescape View File

@ -77,7 +77,10 @@ public interface VoucherService extends IService<VoucherEntity> {
VoucherEntity queryVoucherDetailInfo(String id);
BigDecimal queryVoucherProductNetWeightInfo(String id);
BigDecimal queryVoucherByBusinessOrderInfo(String id);
BigDecimal queryVoucherByBusinessOrderInfo1(String id); //查询订单
BigDecimal queryVoucherByBusinessOrderInfo2(String id); //查询凭证采购额
Map<String, BigDecimal> queryAmountByBusinessOrder(String id);
void updateByVoucherCode(VoucherEntity voucherEntity);

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/WarehousingOutboundService.java
Unescape View File

@ -9,7 +9,9 @@ import java.math.BigDecimal;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jnpf.model.yunguan.YunguanPurchaseInBoundModel;
import jnpf.model.yunguan.YunguanSaleOutBoundModel;
import org.apache.ibatis.annotations.Param;
/**
* warehousingOutbound
@ -62,4 +64,7 @@ public interface WarehousingOutboundService extends IService<WarehousingOutbound
BigDecimal queryCurrentDayNum2(WarehousingOutboundEntity warehousingOutboundEntity);
BigDecimal queryCurrentDayAmount(WarehousingOutboundEntity warehousingOutboundEntity);
//运管销售出库
List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(String id);
}

11
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
Unescape View File

@ -1493,6 +1493,17 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
return businessOrderMapper.getbusinessOrdLn(id);
}
@Override
public List<ContractLEntity> queryBusinessContractInfo(String businessLine, String contractNumber) {
UserInfo userInfo=userProvider.get();
OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
String organize = JSON.toJSONString(organizeJsonId);
organize = organize.replace("[","");
organize = organize.replace("]","");
return businessOrderMapper.queryBusinessContract(businessLine,organize,contractNumber);
}
public void getExcel(List<HashMap<String, Object>> list, String templateFilePath,String settlements,BigDecimal amount) throws Exception {
String[] strings = settlements.split("_");
settlements=strings[0];

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

@ -982,7 +982,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
for (int i=0;i<tableField207.size();i++){
tableField207.get(i).setId(RandomUtil.uuId());
tableField207.get(i).setSettlementId(entity.getId());
tableField207.get(i).setLineNo(String.valueOf(i));
tableField207.get(i).setLineNo(String.valueOf(i+1));
settlementSum = settlementSum.add(tableField207.get(i).getSettlementSum());
if(isSave){
}else{
@ -993,25 +993,25 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
entity.setSettlementSum(settlementSum);
this.updateById(entity);
//推送结算单到运管
/*if(ObjectUtil.equals(entity.getType(), "2")){
//销售
boolean headFlag = this.pushSaleHeadYunguan(entity, cwsettlementForm);
if(headFlag){
boolean lineFlag = this.pushSaleLineYunguan(entity, cwsettlementForm);
}
}else{
//采购
boolean headFlag = this.pushPurchaseHeadYunguan(entity, cwsettlementForm);
if(headFlag){
boolean lineFlag = this.pushPurchaseLineYunguan(entity, cwsettlementForm);
}
}*/
// if(ObjectUtil.equals(entity.getType(), "2")){
// //销售
// boolean headFlag = this.pushSaleHeadYunguan(entity);
// if(headFlag){
// boolean lineFlag = this.pushSaleLineYunguan(entity);
// }
// }else{
// //采购
// boolean headFlag = this.pushPurchaseHeadYunguan(entity);
// if(headFlag){
// boolean lineFlag = this.pushPurchaseLineYunguan(entity);
// }
// }
}
private boolean pushPurchaseLineYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
public boolean pushPurchaseLineYunguan(CwsettlementEntity cwsettlementEntity) {
List<YunguanPurchaseSettlementProductModel> yunguanSaleSettlementProductModelList = new ArrayList<>();
for(int i=0;i<cwsettlementForm.getCwsettlementsummaryList().size();i++){
CwsettlementsummaryModel cwsettlementsummaryModel = cwsettlementForm.getCwsettlementsummaryList().get(i);
for(int i=0;i<cwsettlementEntity.getCwsettlementsummaryList().size();i++){
CwsettlementsummaryModel cwsettlementsummaryModel = cwsettlementEntity.getCwsettlementsummaryList().get(i);
YunguanPurchaseSettlementProductModel yunguanSaleSettlementProductModel = new YunguanPurchaseSettlementProductModel();
//查询公司代码
OrganizeEntity companyEntity = organizeService.getById(cwsettlementEntity.getCompanyId());
@ -1019,15 +1019,15 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setORG_CD(companyEntity.getEnCode());
yunguanSaleSettlementProductModel.setORG_NM(companyEntity.getFullName());
}
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementForm.getCwsettlementsummaryList().get(0).getProductId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementProductModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgName());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementEntity.getCwsettlementsubjectList().get(0).getSubjectId());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementEntity.getCwsettlementsummaryList().get(0).getProductId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementEntity.getCwsettlementcontractList().get(0).getContractId());
// yunguanSaleSettlementProductModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgCode());
OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
if(departmentEntity != null){
yunguanSaleSettlementProductModel.setDEPARTMENT_CODE(departmentEntity.getEnCode());
yunguanSaleSettlementProductModel.setATTRIBUTE9(departmentEntity.getFullName());
// yunguanSaleSettlementProductModel.setATTRIBUTE9(departmentEntity.getFullName());
}
yunguanSaleSettlementProductModel.setACCOUNT_NO(cwsettlementEntity.getCode());
yunguanSaleSettlementProductModel.setACCOUNT_LINE_NO(i);
@ -1068,7 +1068,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
return false;
}
private boolean pushPurchaseHeadYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
public boolean pushPurchaseHeadYunguan(CwsettlementEntity cwsettlementEntity) {
YunguanPurchaseSettlementModel yunguanSaleSettlementModel = new YunguanPurchaseSettlementModel();
yunguanSaleSettlementModel.setID(cwsettlementEntity.getId());
//查询公司代码
@ -1077,7 +1077,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setORG_CD(companyEntity.getEnCode());
yunguanSaleSettlementModel.setORG_NM(companyEntity.getFullName());
}
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementEntity.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
if(departmentEntity != null){
@ -1085,8 +1085,8 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setATTRIBUTE9(departmentEntity.getFullName());
}
yunguanSaleSettlementModel.setACCOUNT_NO(cwsettlementEntity.getCode());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getId());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementEntity.getCwsettlementsubjectList().get(0).getSubjectId());
yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getCode());
yunguanSaleSettlementModel.setVENDOR_NAME(subjectbasicEntity.getName());
//供应商地点编码
yunguanSaleSettlementModel.setVENDOR_SITE_CODE("");
@ -1103,15 +1103,15 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setINVOICE_TYPE(cwsettlementEntity.getInvoiceType());
yunguanSaleSettlementModel.setINVOICE_NO(cwsettlementEntity.getInvoiceNo());
yunguanSaleSettlementModel.setINVOICE_CURRENCY("CNY");
yunguanSaleSettlementModel.setTAX_RATE_CODE("VAT_IN_" + cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE(cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE_CAL(cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE_CODE("VAT_IN_" + cwsettlementEntity.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE(cwsettlementEntity.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE_CAL(cwsettlementEntity.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setEXCHANGE_RATE(1);
yunguanSaleSettlementModel.setEXCHANGE_DATE(null);
yunguanSaleSettlementModel.setGL_DATE(cwsettlementEntity.getGlDate());
BigDecimal ATTRIBUTE1 = new BigDecimal("0");
BigDecimal TAX = new BigDecimal("0");
for (CwsettlementsummaryModel cwsettlementsummaryModel : cwsettlementForm.getCwsettlementsummaryList()) {
for (CwsettlementsummaryModel cwsettlementsummaryModel : cwsettlementEntity.getCwsettlementsummaryList()) {
ATTRIBUTE1 = ATTRIBUTE1.add(new BigDecimal(cwsettlementsummaryModel.getSettlementTotalNo()));
TAX = TAX.add(new BigDecimal(cwsettlementsummaryModel.getSettlementTotalNo()).subtract(new BigDecimal(cwsettlementsummaryModel.getSettlementTotal())));
}
@ -1141,19 +1141,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
return false;
}
private boolean pushSaleLineYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
public boolean pushSaleLineYunguan(CwsettlementEntity cwsettlementEntity) {
List<YunguanSaleSettlementProductModel> yunguanSaleSettlementProductModelList = new ArrayList<>();
for(int i=0;i<cwsettlementForm.getCwsettlementsummaryList().size();i++){
CwsettlementsummaryModel cwsettlementsummaryModel = cwsettlementForm.getCwsettlementsummaryList().get(i);
for(int i=0;i<cwsettlementEntity.getCwsettlementsummaryList().size();i++){
CwsettlementsummaryModel cwsettlementsummaryModel = cwsettlementEntity.getCwsettlementsummaryList().get(i);
YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = new YunguanSaleSettlementProductModel();
//查询公司代码
OrganizeEntity companyEntity = organizeService.getById(cwsettlementEntity.getCompanyId());
if(companyEntity != null){
yunguanSaleSettlementProductModel.setCOMP_CD(companyEntity.getEnCode());
}
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementForm.getCwsettlementsummaryList().get(0).getProductId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementEntity.getCwsettlementsubjectList().get(0).getSubjectId());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementEntity.getCwsettlementsummaryList().get(0).getProductId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementEntity.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgCode());
yunguanSaleSettlementProductModel.setORG_NM(contractLEntity.getKucunOrgName());
OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
@ -1183,19 +1183,19 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setITEM_NM(productWarehouseEntity.getName());
yunguanSaleSettlementProductModel.setMAT_SIZE(productWarehouseEntity.getSpec());
//销售数量
yunguanSaleSettlementProductModel.setORD_PRICE(cwsettlementsummaryModel.getSettlementPrice());
yunguanSaleSettlementProductModel.setORD_PRICE(new BigDecimal(cwsettlementsummaryModel.getSettlementPrice()));
//销售单价
yunguanSaleSettlementProductModel.setORD_QUANTITY(cwsettlementsummaryModel.getSettlementSum());
yunguanSaleSettlementProductModel.setQUANTITY(cwsettlementsummaryModel.getSettlementSum());
yunguanSaleSettlementProductModel.setORD_QUANTITY(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
yunguanSaleSettlementProductModel.setQUANTITY(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
//出库量
yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getStorageNumber());
yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
yunguanSaleSettlementProductModel.setINV_PRICE(cwsettlementsummaryModel.getSettlementPrice());
yunguanSaleSettlementProductModel.setINV_AMT(cwsettlementsummaryModel.getSettlementSubtotal());
yunguanSaleSettlementProductModel.setINV_PRICE(new BigDecimal(cwsettlementsummaryModel.getSettlementPrice()));
yunguanSaleSettlementProductModel.setINV_AMT(new BigDecimal(cwsettlementsummaryModel.getSettlementSubtotal()));
yunguanSaleSettlementProductModel.setTAX_RATE("VAT_OUT_"+cwsettlementsummaryModel.getRate());
yunguanSaleSettlementProductModel.setCURRENCY_TY("CNY");
yunguanSaleSettlementProductModel.setINV_AMT_FOREG(cwsettlementsummaryModel.getSettlementPrice());
yunguanSaleSettlementProductModel.setINV_EXCHG_RAT("1");
yunguanSaleSettlementProductModel.setINV_AMT_FOREG(new BigDecimal(cwsettlementsummaryModel.getSettlementPrice()));
yunguanSaleSettlementProductModel.setINV_EXCHG_RAT(new BigDecimal(1));
yunguanSaleSettlementProductModel.setITEM_NM_INV(cwsettlementsummaryModel.getItemNmInv());
yunguanSaleSettlementProductModel.setATTRIBUTE5(cwsettlementsummaryModel.getRemark());
yunguanSaleSettlementProductModel.setBOOK_DATE(cwsettlementEntity.getBookDate());
@ -1217,6 +1217,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setESB_STATUS("N");
//错误信息
yunguanSaleSettlementProductModel.setERR_MESSAGE("");
yunguanSaleSettlementProductModel.setCK_ORDER(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
}
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
@ -1228,7 +1229,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
return false;
}
private boolean pushSaleHeadYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
public boolean pushSaleHeadYunguan(CwsettlementEntity cwsettlementEntity) {
YunguanSaleSettlementModel yunguanSaleSettlementModel = new YunguanSaleSettlementModel();
yunguanSaleSettlementModel.setID(cwsettlementEntity.getId());
//查询公司代码
@ -1236,7 +1237,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
if(companyEntity != null){
yunguanSaleSettlementModel.setCOMP_CD(companyEntity.getEnCode());
}
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementEntity.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementModel.setORG_ID(contractLEntity.getKucunOrgCode());
yunguanSaleSettlementModel.setORG_NM(contractLEntity.getKucunOrgName());
OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
@ -1253,8 +1254,8 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setINVOICE_TYPE("T");
yunguanSaleSettlementModel.setINV_FLAG(new BigDecimal("-1"));
}
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
yunguanSaleSettlementModel.setCUST_ID(subjectbasicEntity.getId());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementEntity.getCwsettlementsubjectList().get(0).getSubjectId());
yunguanSaleSettlementModel.setCUST_ID(subjectbasicEntity.getCode());
yunguanSaleSettlementModel.setCUST_NAME(subjectbasicEntity.getName());
yunguanSaleSettlementModel.setCONTRACT_CD(contractLEntity.getContractNumber());
yunguanSaleSettlementModel.setKH_CONTR_NO(contractLEntity.getContractNo());
@ -1262,7 +1263,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setCUST_TY(cwsettlementEntity.getCustTy());
BigDecimal settlementSum = new BigDecimal("0");
BigDecimal settlementTotal = new BigDecimal("0");
for (CwsettlementsummaryModel cwsettlementsummaryModel : cwsettlementForm.getCwsettlementsummaryList()) {
for (CwsettlementsummaryModel cwsettlementsummaryModel : cwsettlementEntity.getCwsettlementsummaryList()) {
settlementSum.add(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
settlementTotal.add(new BigDecimal(cwsettlementsummaryModel.getSettlementTotal()));
}
@ -1270,18 +1271,21 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setINV_AMT(settlementTotal);
//查询对账单对应的出库单
BigDecimal storageNum = new BigDecimal("0");
for (CwsettlementaccountModel cwsettlementaccountModel : cwsettlementForm.getCwsettlementaccountList()) {
QueryWrapper<CwaccountstorageEntity> CwaccountstoragequeryWrapper = new QueryWrapper<>();
CwaccountstoragequeryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, cwsettlementaccountModel.getAccountId());
List<CwaccountstorageEntity> cwaccountstorageEntities = cwaccountstorageService.list(CwaccountstoragequeryWrapper);
for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntities) {
storageNum.add(cwaccountstorageEntity.getStorageNum());
}
// for (CwsettlementaccountModel cwsettlementaccountModel : cwsettlementForm.getCwsettlementaccountList()) {
// QueryWrapper<CwaccountstorageEntity> CwaccountstoragequeryWrapper = new QueryWrapper<>();
// CwaccountstoragequeryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, cwsettlementaccountModel.getAccountId());
// List<CwaccountstorageEntity> cwaccountstorageEntities = cwaccountstorageService.list(CwaccountstoragequeryWrapper);
// for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntities) {
// storageNum.add(cwaccountstorageEntity.getStorageNum());
// }
// }
for (CwsettlementsummaryModel entity : cwsettlementEntity.getCwsettlementsummaryList()){
storageNum = storageNum.add(entity.getStorageNumber());
}
yunguanSaleSettlementModel.setSTO_OUT_WGT(storageNum);
yunguanSaleSettlementModel.setCURRENCY_TY("CNY");
yunguanSaleSettlementModel.setINV_EXCHG_RAT(new BigDecimal("1"));
yunguanSaleSettlementModel.setTAX_RATE("VAT_OUT_" + cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE("VAT_OUT_" + cwsettlementEntity.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setCANCLE_YN("0");
yunguanSaleSettlementModel.setSLIT_FLAG("0");
yunguanSaleSettlementModel.setREAD_FLAG("N");
@ -1292,7 +1296,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setMODIFY_DTM(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementModel.setCONSDR_USER(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementModel.setCONSDR_DATE(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementForm.getCwsettlementsummaryList().size());
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {

5
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ProductWarehouseServiceImpl.java
Unescape View File

@ -1476,4 +1476,9 @@ public class ProductWarehouseServiceImpl extends ServiceImpl<ProductWarehouseMap
return this.list(productWarehouseQueryWrapper);
}
}
@Override
public List<ProductWarehouseEntity> getWorkProductList(QueryWrapper<ProductWarehouseEntity> queryWrapper) {
return productWarehouseMapper.getProductWorkList(queryWrapper);
}
}

64
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
Unescape View File

@ -358,6 +358,65 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
}
if(ObjectUtil.isNotEmpty(voucherPagination.getIsSaleDeliveryVoucher())){
voucherNum++;
List<String> idList = new ArrayList<>();
try {
String[][] voucherType = JsonUtil.getJsonToBean(voucherPagination.getIsSaleDeliveryVoucher(),String[][].class);
for(int i=0;i<voucherType.length;i++){
if(voucherType[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(voucherType[i])));
}
}
}catch (Exception e1){
try {
List<String> voucherType = JsonUtil.getJsonToList(voucherPagination.getIsSaleDeliveryVoucher(),String.class);
if(voucherType.size()>0){
idList.addAll(voucherType);
}
}catch (Exception e2){
idList.add(String.valueOf(voucherPagination.getIsSaleDeliveryVoucher()));
}
}
voucherQueryWrapper.and(t->{
idList.forEach(tt->{
t.like("a.is_sale_delivery_voucher", tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(voucherPagination.getIsTransfer())){
voucherNum++;
List<String> idList = new ArrayList<>();
try {
String[][] voucherType = JsonUtil.getJsonToBean(voucherPagination.getIsTransfer(),String[][].class);
for(int i=0;i<voucherType.length;i++){
if(voucherType[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(voucherType[i])));
}
}
}catch (Exception e1){
try {
List<String> voucherType = JsonUtil.getJsonToList(voucherPagination.getIsTransfer(),String.class);
if(voucherType.size()>0){
idList.addAll(voucherType);
}
}catch (Exception e2){
idList.add(String.valueOf(voucherPagination.getIsTransfer()));
}
}
voucherQueryWrapper.and(t->{
idList.forEach(tt->{
t.like("a.is_transfer", tt).or();
});
});
}
if(ObjectUtil.isNotEmpty(voucherPagination.getPreparationTime())){
voucherNum++;
@ -1397,6 +1456,11 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
return voucherMapper.queryVoucherByBusinessOrder1(id);
}
@Override
public BigDecimal queryVoucherByBusinessOrderInfo2(String id) {
return voucherMapper.queryVoucherByBusinessOrder2(id);
}
@Override
public Map<String, BigDecimal> queryAmountByBusinessOrder(String id) {
return voucherMapper.queryAmountByBusinessOrder(id);

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

@ -8,6 +8,7 @@ import jnpf.mapper.WarehousingNotificationMapper;
import jnpf.mapper.WarehousingOutboundMapper;
import jnpf.model.deliveryorder.DeliveryOrderForm;
import jnpf.model.deliveryorder.DeliveryProductRelationModel;
import jnpf.model.yunguan.YunguanPurchaseInBoundModel;
import jnpf.model.yunguan.YunguanSaleOutBoundModel;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -911,13 +912,9 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
}
}
// if (entity.getWarehousingOutboundType().equals("12")){
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModel = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
//// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundProductByYunGuan(entity.getId());
//// for (YunguanSaleOutBoundModel model : yunguanSaleOutBoundModelList){
//// BeanMergeUtil.merge(model,yunguanSaleOutBoundModel);
//// }
// if (yunguanSaleOutBoundModel != null && yunguanSaleOutBoundModel.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModel));
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
// if (ObjectUtil.isNotEmpty(saleCode)){
// if (saleCode.get("code").equals("200")) {
// }
@ -940,4 +937,9 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
public BigDecimal queryCurrentDayAmount(WarehousingOutboundEntity warehousingOutboundEntity) {
return warehousingOutboundMapper.queryCurrentDayAmount(warehousingOutboundEntity);
}
@Override
public List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(String id) {
return warehousingOutboundMapper.saleOutBoundByYunGuan(id);
}
}

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

@ -952,13 +952,9 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
}
}
// if (entity.getWarehousingStorageType().equals("15")){
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModel = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
//// List<YunguanPurchaseInBoundModel> yunguanPurchaseProductInBoundModelList = warehousingStorageMapper.purchaseInBoundProductByYunGuan(entity.getId());
//// for (YunguanPurchaseInBoundModel model : yunguanPurchaseProductInBoundModelList){
//// BeanMergeUtil.merge(model,yunguanPurchaseInBoundModel);
//// }
// if (yunguanPurchaseInBoundModel != null && yunguanPurchaseInBoundModel.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModel));
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
// if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) {
// }
@ -1161,6 +1157,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
organize = organize.replace("]","");
warehousingStorageQueryWrapper.like("a.organize_json_id",organize);
}
// warehousingStorageQueryWrapper.eq("a.yunguan_mark","Y");
warehousingStorageQueryWrapper.isNull("a.f_delete_mark");
IPage<WarehousingStorageEntity> userIPage;
if(StringUtil.equals(warehousingStoragePagination.getType(), "1")){

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

@ -1,5 +1,7 @@
package jnpf.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@ -13,10 +15,7 @@ import jnpf.engine.entity.FlowTaskNodeEntity;
import jnpf.engine.service.FlowTaskNodeService;
import jnpf.engine.service.FlowTaskService;
import jnpf.exception.DataException;
import jnpf.model.yunguan.YunguanPurchaseOrderModel;
import jnpf.model.yunguan.YunguanPurchaseOrderProductModel;
import jnpf.model.yunguan.YunguanSaleOrderModel;
import jnpf.model.yunguan.YunguanSaleOrderProductModel;
import jnpf.model.yunguan.*;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.OrganizeService;
@ -25,10 +24,9 @@ import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.businessorder.*;
import jnpf.util.wxutil.HttpUtil;
import jnpf.yozo.utils.HttpRequestUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@ -70,8 +68,6 @@ import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
import static cn.hutool.core.lang.Console.log;
/**
* businessOrder
* @版本： V3.5
@ -124,6 +120,16 @@ public class BusinessOrderController {
private VoucherService voucherService;
@Autowired
private VoucherProductService voucherProductService;
@Autowired
private WarehousingStorageService warehousingStorageService;
@Autowired
private WarehousingOutboundService warehousingOutboundService;
@Autowired
private WorkOrderService workOrderService;
@Autowired
private CwsettlementController cwsettlementController;
@Autowired
private CwsettlementService cwsettlementService;
/**
* 列表
@ -173,6 +179,13 @@ public class BusinessOrderController {
entity.setProfit(saleAmount.subtract(purchaseAmount));//利润
}
if (entity.getProfit().compareTo(BigDecimal.ZERO) <= 0){
BigDecimal purchaseAmount1 = voucherService.queryVoucherByBusinessOrderInfo2(entity.getId()); //采购订单总额
entity.setProfit(saleAmount.subtract(purchaseAmount1));//利润
}
Map<String, Object> businessOrderMap=JsonUtil.entityToMap(entity);
businessOrderMap.put("id", businessOrderMap.get("id"));
//副表数据
@ -624,12 +637,16 @@ public class BusinessOrderController {
}
// if (entity.getBusinessType().equals("1")) {
// YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
// purchaseOrder.setSUPPLIER_SITE_ID("12345");
// if (ObjectUtil.isNotEmpty(purchaseOrder)) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
// if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) {
// List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
// JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
// if(ObjectUtil.isNotEmpty(purchaseCode)){
// System.out.println(purchaseCode.toString());
// }
// }
// }
// }
@ -641,6 +658,7 @@ public class BusinessOrderController {
// 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));
// System.out.println(saleProductCode);
// }
// }
// }
@ -774,6 +792,7 @@ public class BusinessOrderController {
businessOrderQueryWrapper.isNull("a.f_delete_mark");
businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
businessOrderQueryWrapper.like("a.organize_json_id",organize);
// businessOrderQueryWrapper.eq("a.yunguan_mark","Y");
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.saleOrderByDeliveryOrderInfo(businessOrderQueryWrapper);
// List<Map<String, Object>> realList=new ArrayList<>();
for (BusinessOrderEntity entity: businessOrderEntityList) {
@ -879,7 +898,7 @@ public class BusinessOrderController {
businessOrderQueryWrapper.isNull("a.f_delete_mark");
businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
businessOrderQueryWrapper.like("a.organize_json_id",organize);
// businessOrderQueryWrapper.eq("a.yunguan_mark","200");
// businessOrderQueryWrapper.eq("a.yunguan_mark","Y");
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
// List<Map<String, Object>> realList=new ArrayList<>();
for (BusinessOrderEntity entity: businessOrderEntityList) {
@ -1232,7 +1251,7 @@ public class BusinessOrderController {
@GetMapping("/createReceiptOrderByVoucher")
public ActionResult createReceiptOrderByVoucher(@RequestParam("businessOrderId") String businessOrderId)throws IOException{
QueryWrapper<BusinessOrderEntity> businessOrderQueryWrapper=new QueryWrapper<>();
businessOrderQueryWrapper.eq("a.id",businessOrderId);
businessOrderQueryWrapper.eq("a.id",businessOrderId);
businessOrderQueryWrapper.isNull("a.f_delete_mark");
businessOrderQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
List<BusinessOrderEntity> businessOrderEntityList = businessOrderService.purchaseOrderByReceiptOrderInfo(businessOrderQueryWrapper);
@ -1380,5 +1399,137 @@ public class BusinessOrderController {
return ActionResult.success("更新成功");
}
/**
* 重新向运管推送数据
*
* @param id
* @return
*/
@Operation(summary = "重新向运管推送数据")
@GetMapping("repush")
public ActionResult repush(@RequestParam("id") String id,@RequestParam("type") String type) {
if (type.equals("1")){ //采购订单接口
YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
purchaseOrder.setSUPPLIER_SITE_ID("12345");
if (ObjectUtil.isNotEmpty(purchaseOrder)) {
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
if (ObjectUtil.isNotEmpty(purchaseCode) && purchaseCode.get("code").equals("200")){
List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
if(ObjectUtil.isNotEmpty(purchaseProductCode) && purchaseProductCode.get("code").equals("200")){
return ActionResult.success("推送成功");
}else{
return ActionResult.fail("推送采购订单行失败");
}
}else{
return ActionResult.fail("推送采购订单头失败");
}
}
}else if (type.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) && 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) && saleProductCode.get("code").equals("200")){
return ActionResult.success("推送成功");
}else{
return ActionResult.fail("推送销售订单行失败");
}
}else{
return ActionResult.fail("推送销售订单头失败");
}
}
} else if (type.equals("3")) { //采购入库接口
List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
if (ObjectUtil.isNotEmpty(purchaseCode) && purchaseCode.get("code").equals("200")){
return ActionResult.success("推送成功");
}else{
return ActionResult.fail("推送失败");
}
}
} else if (type.equals("4")) { //销售出库接口
List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(id);
if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")){
return ActionResult.success("推送成功");
}else {
return ActionResult.fail("推送失败");
}
}
} else if (type.equals("5")) { //生产加工接口
List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
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")){
return ActionResult.success("推送成功");
}else{
return ActionResult.fail("推送失败");
}
} else if (type.equals("6")) { //采购结算接口
ActionResult entity = cwsettlementController.info(id);
Map<String, Object> map = (Map<String, Object>) entity.getData();
CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions());
boolean purchaseHead = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
if (purchaseHead){
boolean purchaseLine = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
if (purchaseLine){
return ActionResult.success("推送成功");
}else{
return ActionResult.fail("采购结算行推送失败");
}
}else{
return ActionResult.fail("采购结算头推送失败");
}
} else if (type.equals("7")) { //销售结算接口
ActionResult entity = cwsettlementController.info(id);
Map<String, Object> map = (Map<String, Object>) entity.getData();
CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions());
boolean saleHead = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
if (saleHead){
boolean saleLine = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
if (saleLine){
return ActionResult.success("推送成功");
}else{
return ActionResult.fail("销售结算行推送失败");
}
}else{
return ActionResult.fail("销售结算头推送失败");
}
}
return null;
}
/**
* 列表
*
* @return
*/
@Operation(summary = "获取业务线合同")
@GetMapping("/getBusinessContractList")
public ActionResult businessContractList(@RequestParam("businessLine") String businessLine,@RequestParam("contractNumber") String contractNumber )throws IOException{
if (businessLine!=null && contractNumber!=null){
List<ContractLEntity> list= businessOrderService.queryBusinessContractInfo(businessLine,contractNumber);
for (ContractLEntity entity : list){
List<ProductByContractModel> productByContractModelList = businessOrderService.queryProductByContractInfo(entity.getId());
entity.setProductByContractModelList(productByContractModelList);
QueryWrapper<SubjectbasicEntity> subjectQueryWrapper = new QueryWrapper<>();
subjectQueryWrapper.lambda().eq(SubjectbasicEntity::getId,entity.getSubject());
List<SubjectbasicEntity> subjectbasicEntityList = subjectbasicService.list(subjectQueryWrapper);
entity.setSubjectbasicEntityList(subjectbasicEntityList);
}
return ActionResult.success(list);
}else {
return ActionResult.success("没有合同或者业务线");
}
}
}

41
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java
Unescape View File

@ -1,13 +1,17 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.OrganizeService;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
@ -56,6 +60,8 @@ public class ProductWarehouseController {
@Autowired
private ProductBusinessService productBusinessService;
@Autowired
private OrganizeService organizeService;
/**
* 列表
@ -183,10 +189,27 @@ public class ProductWarehouseController {
@Operation(summary = "加工获取商品列表")
@GetMapping("/getBomProductlists1")
public ActionResult bomProductlists1()throws IOException{
ProductWarehousePagination productWarehousePagination=new ProductWarehousePagination();
productWarehousePagination.setDataType("0");
productWarehousePagination.setMenuId("522017337285542021");
List<ProductWarehouseEntity> list= productWarehouseService.getProductList(productWarehousePagination);
// ProductWarehousePagination productWarehousePagination=new ProductWarehousePagination();
// productWarehousePagination.setDataType("0");
// productWarehousePagination.setMenuId("522017337285542021");
// List<ProductWarehouseEntity> list= productWarehouseService.getProductList(productWarehousePagination);
UserInfo userInfo=userProvider.get();
OrganizeEntity organizeEntity = organizeService.getInfo(userInfo.getOrganizeId());
List<String> organizeJsonId = Arrays.stream(organizeEntity.getCompanyIdTree().split(",")).collect(Collectors.toList());
String organize = JSON.toJSONString(organizeJsonId);
organize = organize.replace("[","");
organize = organize.replace("]","");
QueryWrapper<ProductWarehouseEntity> productWarehouseQueryWrapper=new QueryWrapper<>();
productWarehouseQueryWrapper.isNull("a.f_delete_mark");
productWarehouseQueryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
productWarehouseQueryWrapper.like("a.organize_json_id",organize);
List<ProductWarehouseEntity> list=productWarehouseService.getWorkProductList(productWarehouseQueryWrapper);
List<Map<String, Object>> realList=new ArrayList<>();
for (ProductWarehouseEntity entity : list) {
// entity.setInventoryType(entity.getInventoryTypes());
@ -194,7 +217,7 @@ public class ProductWarehouseController {
entity.setProductTypeId(entity.getProductTypeIds());
entity.setInventoryUnitId(entity.getInventoryUnitIds());
entity.setProportionNum("0");
entity.setBatchNumber("JG24000PZ");
// entity.setBatchNumber("JG24000PZ");
Map<String, Object> productWarehouseMap=JsonUtil.entityToMap(entity);
productWarehouseMap.put("id", productWarehouseMap.get("id"));
//副表数据
@ -209,10 +232,10 @@ public class ProductWarehouseController {
realList.add(productWarehouseMap);
}
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(productWarehousePagination, PaginationVO.class);
vo.setPagination(page);
// PageListVO vo = new PageListVO();
// vo.setList(realList);
// PaginationVO page = JsonUtil.getJsonToBean(productWarehousePagination, PaginationVO.class);
// vo.setPagination(page);
return ActionResult.success(list);
}

10
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
Unescape View File

@ -275,7 +275,7 @@ public class VoucherController {
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, VoucherConstant.getFormData(), VoucherConstant.getColumnData(), voucherPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(voucherPagination.getSelectKey())?voucherPagination.getSelectKey():new String[0];
String[]keys=!StringUtil.isEmpty(voucherPagination.getSelectKey())?voucherPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
@ -378,6 +378,9 @@ public class VoucherController {
case "associatedDocumentNo" :
entitys.add(new ExcelExportEntity("关联单据号" ,"associatedDocumentNo"));
break;
case "saleAmount" :
entitys.add(new ExcelExportEntity("销售额" ,"saleAmount"));
break;
case "orderNo" :
entitys.add(new ExcelExportEntity("订单序号" ,"orderNo"));
break;
@ -400,7 +403,10 @@ public class VoucherController {
tableField111List.add(new ExcelExportEntity("扣重" ,"buckleWeight"));
break;
case "tableField111-netWeight":
tableField111List.add(new ExcelExportEntity("净重" ,"netWeight"));
tableField111List.add(new ExcelExportEntity("结算量" ,"netWeight"));
break;
case "tableField111-clearWeight":
tableField111List.add(new ExcelExportEntity("净重" ,"clearWeight"));
break;
case "tableField111-remark":
tableField111List.add(new ExcelExportEntity("备注" ,"remark"));

10
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingOutboundController.java
Unescape View File

@ -687,6 +687,16 @@ public class WarehousingOutboundController {
//inventoryLogEntity.setRetailPrice();//零售价
inventoryLogService.saveOrUpdate(inventoryLogEntity);
}
// if (entity.getWarehousingOutboundType().equals("1")){
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(entity.getId());
// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
// if (ObjectUtil.isNotEmpty(saleCode)){
// if (saleCode.get("code").equals("200")) {
// }
// }
// }
// }
}
}catch(Exception e){
return ActionResult.fail("修改数据失败");

2
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingStorageController.java
Unescape View File

@ -715,7 +715,7 @@ public class WarehousingStorageController {
//inventoryLogEntity.setRetailPrice();//零售价
inventoryLogService.saveOrUpdate(inventoryLogEntity);
}
// if (entity.getWarehousingStorageType().equals("1") || entity.getWarehousingStorageType().equals("15")){
// if (entity.getWarehousingStorageType().equals("1")){
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));

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

@ -4,28 +4,24 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tencentcloudapi.iot.v20180123.models.ProductEntry;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.entity.ProvinceEntity;
import jnpf.base.service.ProvinceService;
import jnpf.constant.PermissionConst;
import jnpf.entity.*;
import jnpf.model.yunguan.YunguanCustomerModel;
import jnpf.model.yunguan.YunguanSaleCollectionModel;
import jnpf.model.yunguan.*;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.service.OrganizeService;
import jnpf.service.*;
import jnpf.util.JsonUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import java.io.IOException;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
@ -64,6 +60,28 @@ public class YunguanInterfaceController {
private ProvinceService provinceService;
@Autowired
private CwSaleCollectionService cwSaleCollectionService;
@Autowired
private BusinessOrderService businessOrderService;
@Autowired
private BusinessOrderProductRelationalService businessOrderProductRelationalService;
@Autowired
private WarehousingStorageService warehousingStorageService;
@Autowired
private WarehousingStorageProductService warehousingStorageProductService;
@Autowired
private WarehousingOutboundService warehousingOutboundService;
@Autowired
private WarehousingOutboundProductService warehousingOutboundProductService;
@Autowired
private CwsettlementService cwsettlementService;
@Autowired
private CwsettlementsummaryService cwsettlementsummaryService;
@Autowired
private WorkOrderService workOrderService;
@Autowired
private WorkOrderPrimaryService workOrderPrimaryService;
@Autowired
private WorkOrderProductService workOrderProductService;
/**
* 运管推送客户数据到智慧
*
@ -114,7 +132,7 @@ public class YunguanInterfaceController {
if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
entity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (ObjectUtil.isNotEmpty(jsonObject.get("VALID_FROM"))) {
try {
entity.setCollaborationStart(sdf.parse(jsonObject.get("VALID_FROM").toString()));//合作开始时间
@ -165,7 +183,7 @@ public class YunguanInterfaceController {
if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
subjectbasicEntity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (ObjectUtil.isNotEmpty(jsonObject.get("VALID_FROM"))) {
try {
subjectbasicEntity.setCollaborationStart(sdf.parse(jsonObject.get("VALID_FROM").toString()));//合作开始时间
@ -232,7 +250,7 @@ public class YunguanInterfaceController {
if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
entity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (ObjectUtil.isNotEmpty(jsonObject.get("TAX_EFFECTIVE_FROM"))) {
try {
entity.setCollaborationStart(sdf.parse(jsonObject.get("TAX_EFFECTIVE_FROM").toString()));//合作开始时间
@ -280,7 +298,7 @@ public class YunguanInterfaceController {
if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity2)){
subjectbasicEntity.setEnterpriseNature(dictionaryyunguandataEntity2.getZhihuiValue());//企业性质
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-NN-dd HH:mm:ss");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
if (ObjectUtil.isNotEmpty(jsonObject.get("TAX_EFFECTIVE_FROM"))) {
try {
subjectbasicEntity.setCollaborationStart(sdf.parse(jsonObject.get("TAX_EFFECTIVE_FROM").toString()));//合作开始时间
@ -483,10 +501,12 @@ public class YunguanInterfaceController {
//风险提示
contractLEntity.setRiskInfo(ObjectUtil.isNotEmpty(jsonObject.get("RISK_INFO")) ? jsonObject.get("RISK_INFO").toString() : "");
//销售类型
if(ObjectUtil.equal("自产", jsonObject.get("SAL_INV_TYPE").toString())){
contractLEntity.setSalInvType("1");
}else {
contractLEntity.setSalInvType("2");
if (ObjectUtil.isNotEmpty(jsonObject.get("SAL_INV_TYPE"))) {
if (ObjectUtil.equal("自产", jsonObject.get("SAL_INV_TYPE").toString())) {
contractLEntity.setSalInvType("1");
} else {
contractLEntity.setSalInvType("2");
}
}
contractLService.saveOrUpdate(contractLEntity);
return ActionResult.success("运管推送合同信息到智慧成功");
@ -757,4 +777,235 @@ public class YunguanInterfaceController {
return ActionResult.success("运管推送销售收款到智慧成功");
}
/**
* 接收运管返回状态
*
* @param
* @return
*/
@Operation(summary = "接收运管返回状态")
@PostMapping("/returnData")
public ActionResult syncReturnData(HttpServletRequest httpRequest) throws IOException {
ServletInputStream inputStream = httpRequest.getInputStream();
byte[] bytes = new byte[httpRequest.getContentLength()];
inputStream.read(bytes);
String str = new String(bytes, StandardCharsets.UTF_8);
JSONObject jsonObject = JSONObject.parseObject(str);
if (ObjectUtil.isNotEmpty(jsonObject)){
if (jsonObject.get("type").equals("采购订单头")){
YunguanPurchaseOrderModel yunguanPurchaseOrderModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseOrderModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanPurchaseOrderModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
}
} else if (jsonObject.get("type").equals("采购订单行")) {
YunguanPurchaseOrderProductModel yunguanPurchaseOrderProductModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderProductModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseOrderProductModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanPurchaseOrderProductModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
QueryWrapper<BusinessOrderProductRelationalEntity> businessProductQueryWrapper = new QueryWrapper<>();
businessProductQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
businessProductQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getOrdLn,yunguanPurchaseOrderProductModel.getORD_LN().replaceFirst("^0*", ""));
BusinessOrderProductRelationalEntity businessOrderProductRelationalEntity = businessOrderProductRelationalService.getOne(businessProductQueryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderProductRelationalEntity)){
businessOrderProductRelationalEntity.setYunguanMark(yunguanPurchaseOrderProductModel.getREAD_FLAG());
businessOrderProductRelationalEntity.setYunguanTime(yunguanPurchaseOrderProductModel.getREAD_TIME());
businessOrderProductRelationalEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE());
businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity);
}
}
}
} else if (jsonObject.get("type").equals("销售订单头")) {
YunguanSaleOrderModel yunguanSaleOrderModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderModel.class);
if (StringUtils.isNotEmpty(yunguanSaleOrderModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanSaleOrderModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
}
} else if (jsonObject.get("type").equals("销售订单行")) {
YunguanSaleOrderProductModel yunguanSaleOrderProductModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderProductModel.class);
if (StringUtils.isNotEmpty(yunguanSaleOrderProductModel.getORD_NO())){
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanSaleOrderProductModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
QueryWrapper<BusinessOrderProductRelationalEntity> businessProductQueryWrapper = new QueryWrapper<>();
businessProductQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
businessProductQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getOrdLn,yunguanSaleOrderProductModel.getLINE_NO().replaceFirst("^0*", ""));
BusinessOrderProductRelationalEntity businessOrderProductRelationalEntity = businessOrderProductRelationalService.getOne(businessProductQueryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderProductRelationalEntity)){
businessOrderProductRelationalEntity.setYunguanMark(yunguanSaleOrderProductModel.getREAD_FLAG());
businessOrderProductRelationalEntity.setYunguanTime(yunguanSaleOrderProductModel.getREAD_TIME());
businessOrderProductRelationalEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE());
businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity);
}
}
}
} else if (jsonObject.get("type").equals("采购入库")) {
YunguanPurchaseInBoundModel yunguanPurchaseInBoundModel = JsonUtil.getJsonToBean(str,YunguanPurchaseInBoundModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseInBoundModel.getRECEIPT_NO())){
QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,yunguanPurchaseInBoundModel.getRECEIPT_NO());
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageEntity)){
QueryWrapper<WarehousingStorageProductEntity> warehousingStorageProductQueryWrapper = new QueryWrapper<>();
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId());
warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN());
WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){
warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageProductService.updateById(warehousingStorageProductEntity);
if (!warehousingStorageEntity.getYunguanMark().equals("N")){
warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG());
warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME());
warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE());
warehousingStorageService.updateById(warehousingStorageEntity);
}
}
}
}
} else if (jsonObject.get("type").equals("销售出库")) {
YunguanSaleOutBoundModel yunguanSaleOutBoundModel = JsonUtil.getJsonToBean(str,YunguanSaleOutBoundModel.class);
if (StringUtils.isNotEmpty(yunguanSaleOutBoundModel.getPROD_ZL())){
QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper = new QueryWrapper<>();
warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo,yunguanSaleOutBoundModel.getPROD_ZL());
WarehousingOutboundEntity warehousingOutboundEntity = warehousingOutboundService.getOne(warehousingOutboundQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingOutboundEntity)){
QueryWrapper<WarehousingOutboundProductEntity> warehousingOutboundProductQueryWrapper = new QueryWrapper<>();
warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId,warehousingOutboundEntity.getId());
warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getOrderLine,yunguanSaleOutBoundModel.getCK_ORDER());
WarehousingOutboundProductEntity warehousingOutboundProductEntity = warehousingOutboundProductService.getOne(warehousingOutboundProductQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingOutboundProductEntity)){
warehousingOutboundProductEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
warehousingOutboundProductService.updateById(warehousingOutboundProductEntity);
if (!warehousingOutboundEntity.getYunguanMark().equals("N")){
warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());
warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME());
warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE());
}
}
}
}
} else if (jsonObject.get("type").equals("采购结算头")) {
YunguanPurchaseSettlementModel yunguanPurchaseSettlementModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseSettlementModel.getACCOUNT_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanPurchaseSettlementModel.getACCOUNT_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
}
} else if (jsonObject.get("type").equals("采购结算行")) {
YunguanPurchaseSettlementProductModel yunguanPurchaseSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementProductModel.class);
if (StringUtils.isNotEmpty(yunguanPurchaseSettlementProductModel.getACCOUNT_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanPurchaseSettlementProductModel.getACCOUNT_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
QueryWrapper<CwsettlementsummaryEntity> cwsettlementsummaryQueryWrapper = new QueryWrapper<>();
cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getLineNo,yunguanPurchaseSettlementProductModel.getACCOUNT_LINE_NO());
CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(cwsettlementsummaryQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)){
cwsettlementsummaryEntity.setYunguanMark(yunguanPurchaseSettlementProductModel.getREAD_FLAG());
cwsettlementsummaryEntity.setYunguanTime(yunguanPurchaseSettlementProductModel.getREAD_TIME());
cwsettlementsummaryEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE());
cwsettlementsummaryService.updateById(cwsettlementsummaryEntity);
}
}
}
} else if (jsonObject.get("type").equals("销售结算头")) {
YunguanSaleSettlementModel yunguanSaleSettlementModel = JsonUtil.getJsonToBean(str,YunguanSaleSettlementModel.class);
if (StringUtils.isNotEmpty(yunguanSaleSettlementModel.getINVOICE_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementModel.getINVOICE_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG());
cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME());
cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE());
cwsettlementService.updateById(cwsettlementEntity);
}
}
} else if (jsonObject.get("type").equals("销售结算行")) {
YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanSaleSettlementProductModel.class);
if (StringUtils.isNotEmpty(yunguanSaleSettlementProductModel.getINVOICE_NO())){
QueryWrapper<CwsettlementEntity> cwsettlementQueryWrapper = new QueryWrapper<>();
cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementProductModel.getINVOICE_NO());
CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementEntity)){
QueryWrapper<CwsettlementsummaryEntity> cwsettlementsummaryQueryWrapper = new QueryWrapper<>();
cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId());
cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getLineNo,yunguanSaleSettlementProductModel.getATTRIBUTE4());
CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(cwsettlementsummaryQueryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)){
cwsettlementsummaryEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG());
cwsettlementsummaryEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME());
cwsettlementsummaryEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE());
cwsettlementsummaryService.updateById(cwsettlementsummaryEntity);
}
}
}
} else if (jsonObject.get("type").equals("生产加工")) {
YunguanProductProcessModel yunguanProductProcessModel = JsonUtil.getJsonToBean(str,YunguanProductProcessModel.class);
if (StringUtils.isNotEmpty(yunguanProductProcessModel.getTASK_NO())){
QueryWrapper<WorkOrderEntity> workOrderQueryWrapper = new QueryWrapper<>();
workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO());
WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper);
if (ObjectUtil.isNotEmpty(workOrderEntity)){
QueryWrapper<ProductWarehouseEntity> productQueryWrapper = new QueryWrapper<>();
productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper);
if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("投入")){
QueryWrapper<WorkOrderPrimaryEntity> workOrderPrimaryQueryWrapper = new QueryWrapper<>();
workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId());
workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getProductId,productWarehouseEntity.getId());
WorkOrderPrimaryEntity workOrderPrimaryEntity = workOrderPrimaryService.getOne(workOrderPrimaryQueryWrapper);
if (ObjectUtil.isNotEmpty(workOrderPrimaryEntity)){
workOrderPrimaryEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderPrimaryEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderPrimaryEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderPrimaryService.updateById(workOrderPrimaryEntity);
}
} else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) {
QueryWrapper<WorkOrderProductEntity> workOrderProductQueryWrapper = new QueryWrapper<>();
workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId());
workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getProductId,productWarehouseEntity.getId());
WorkOrderProductEntity workOrderProductEntity = workOrderProductService.getOne(workOrderProductQueryWrapper);
if (ObjectUtil.isNotEmpty(workOrderProductEntity)){
workOrderProductEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG());
workOrderProductEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME());
workOrderProductEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE());
workOrderProductService.updateById(workOrderProductEntity);
}
}
}
}
}
}
return ActionResult.success("接收状态成功");
}
}

7
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemEntity.java
Unescape View File

@ -58,6 +58,9 @@ public class BomItemEntity {
@TableField(value = "SALES_MAIN_UNIT_IDS" , updateStrategy = FieldStrategy.IGNORED)
private String salesMainUnitIds;
@TableField(exist = false)
private String A;
/** 编码 **/
@TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
private String code;
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BomItemValueEntity.java
Unescape View File

@ -64,4 +64,8 @@ public class BomItemValueEntity {
/** 投入/副产品 **/
@TableField(value = "IS_INPUT" , updateStrategy = FieldStrategy.IGNORED)
private String isInput;
/** 编码 **/
@TableField(value = "CODE" , updateStrategy = FieldStrategy.IGNORED)
private String code;
}

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderProductRelationalEntity.java
Unescape View File

@ -78,6 +78,18 @@ public class BusinessOrderProductRelationalEntity {
private String saleNumDay;
@TableField("ORD_LN")
private String ordLn;
@TableField("ERP_MARK")
private String erpMark;
@TableField("ERP_MASSAGE")
private String erpMassage;
@TableField("ERP_TIME")
private Date erpTime;
@TableField("YUNGUAN_MARK")
private String yunguanMark;
@TableField("YUNGUAN_MASSAGE")
private String yunguanMassage;
@TableField("YUNGUAN_TIME")
private Date yunguanTime;
@TableField(exist = false)
private List<String> voucherIdList;

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java
Unescape View File

@ -152,6 +152,8 @@ public class ContractLEntity {
@TableField(exist = false)
private String firstSupplyId;
@TableField(exist = false)
private String businessName;
@TableField(exist = false)
private List<SubjectbasicEntity> subjectbasicEntityList;
@TableField(exist = false)
private List<ProductByContractModel> productByContractModelList;

20
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementEntity.java
Unescape View File

@ -3,6 +3,7 @@ package jnpf.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonProperty;
import jnpf.model.cwsettlement.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
@ -148,6 +149,25 @@ public class CwsettlementEntity {
private String yunguanMassage;
@TableField("yunguan_time")
private Date yunguanTime;
/** 子表数据 **/
@TableField(exist = false)
private List<CwsettlementsubjectModel> cwsettlementsubjectList;
/** 子表数据 **/
@TableField(exist = false)
private List<CwsettlementcontractModel> cwsettlementcontractList;
/** 子表数据 **/
@TableField(exist = false)
private List<CwsettlementaccountModel> cwsettlementaccountList;
/** 子表数据 **/
@TableField(exist = false)
private List<CwsettlementcostModel> cwsettlementcostList;
/** 子表数据 **/
@TableField(exist = false)
private List<CwsettlementpaymentreceiptModel> cwsettlementpaymentreceiptList;
/** 子表数据 **/
@TableField(exist = false)
private List<CwsettlementsummaryModel> cwsettlementsummaryList;
@TableField("settlement_sum")
private BigDecimal settlementSum;
@TableField("apply_state")

22
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CwsettlementsummaryEntity.java
Unescape View File

@ -84,14 +84,26 @@ public class CwsettlementsummaryEntity {
private String description;
@TableField("ITEM_NM_INV")
private String itemNmInv;
@TableField("ord_ln")
@TableField("ORD_LN")
private String ordLn;
@TableField("business_code")
@TableField("BUSINESS_CODE")
private String businessCode;
@TableField("docment_no")
@TableField("DOCMENT_NO")
private String docmentNo;
@TableField("warehouse_name")
@TableField("WAREHOUSE_NAME")
private String warehouseName;
@TableField("storage_number")
@TableField("STORAGE_NUMBER")
private BigDecimal storageNumber;
@TableField("ERP_MARK")
private String erpMark;
@TableField("ERP_MASSAGE")
private String erpMassage;
@TableField("ERP_TIME")
private Date erpTime;
@TableField("YUNGUAN_MARK")
private String yunguanMark;
@TableField("YUNGUAN_MASSAGE")
private String yunguanMassage;
@TableField("YUNGUAN_TIME")
private Date yunguanTime;
}

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingOutboundProductEntity.java
Unescape View File

@ -75,6 +75,18 @@ public class WarehousingOutboundProductEntity {
private String ordLn;
@TableField("ORDER_LINE")
private String orderLine;
@TableField("ERP_MARK")
private String erpMark;
@TableField("ERP_MASSAGE")
private String erpMassage;
@TableField("ERP_TIME")
private Date erpTime;
@TableField("YUNGUAN_MARK")
private String yunguanMark;
@TableField("YUNGUAN_MASSAGE")
private String yunguanMassage;
@TableField("YUNGUAN_TIME")
private Date yunguanTime;
/**
* 退货单的商品列表

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java
Unescape View File

@ -75,6 +75,18 @@ public class WarehousingStorageProductEntity {
private BigDecimal businessPrice;
@TableField("ORD_LN")
private String ordLn;
@TableField("ERP_MARK")
private String erpMark;
@TableField("ERP_MASSAGE")
private String erpMassage;
@TableField("ERP_TIME")
private Date erpTime;
@TableField("YUNGUAN_MARK")
private String yunguanMark;
@TableField("YUNGUAN_MASSAGE")
private String yunguanMassage;
@TableField("YUNGUAN_TIME")
private Date yunguanTime;
/**
* 退货单的商品列表

13
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java
Unescape View File

@ -80,5 +80,16 @@ public class WorkOrderPrimaryEntity {
/** 投入/副产品 **/
@TableField(value = "IS_INPUT" , updateStrategy = FieldStrategy.IGNORED)
private String isInput;
@TableField("ERP_MARK")
private String erpMark;
@TableField("ERP_MASSAGE")
private String erpMassage;
@TableField("ERP_TIME")
private Date erpTime;
@TableField("YUNGUAN_MARK")
private String yunguanMark;
@TableField("YUNGUAN_MASSAGE")
private String yunguanMassage;
@TableField("YUNGUAN_TIME")
private Date yunguanTime;
}

13
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java
Unescape View File

@ -76,5 +76,16 @@ public class WorkOrderProductEntity {
@TableField(exist = false)
private BigDecimal nums;
@TableField("ERP_MARK")
private String erpMark;
@TableField("ERP_MASSAGE")
private String erpMassage;
@TableField("ERP_TIME")
private Date erpTime;
@TableField("YUNGUAN_MARK")
private String yunguanMark;
@TableField("YUNGUAN_MASSAGE")
private String yunguanMassage;
@TableField("YUNGUAN_TIME")
private Date yunguanTime;
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/bom/BomItemModel.java
Unescape View File

@ -46,4 +46,8 @@ public class BomItemModel {
/** 销售单位 **/
@JSONField(name = "salesMainUnitIds")
private String salesMainUnitIds;
/** code **/
@JSONField(name = "code")
private String code;
}

4
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/bom/BomItemValueModel.java
Unescape View File

@ -57,4 +57,8 @@ public class BomItemValueModel {
/** 投入/副产品 **/
@JSONField(name = "isInput")
private String isInput;
/** code **/
@JSONField(name = "code")
private String code;
}

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderPagination.java
Unescape View File

@ -86,4 +86,6 @@ public class BusinessOrderPagination extends Pagination {
/** 合同编码 */
@JsonProperty("contractNumber")
private String contractNumber;
}

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherPagination.java
Unescape View File

@ -97,4 +97,10 @@ public class VoucherPagination extends Pagination {
private String businessOrderNo;
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 是否生成销售凭证 */
@JsonProperty("isSaleDeliveryVoucher")
private Object isSaleDeliveryVoucher;
/** 是否生成销售订单 */
@JsonProperty("isTransfer")
private Object isTransfer;
}

12
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderModel.java
Unescape View File

@ -25,6 +25,9 @@ public class YunguanSaleOrderModel {
/** 库存组织名称 **/
@JSONField(name = "ORG_NM")
private String ORG_NM;
/** 库存组织名称 **/
@JSONField(name = "DEPARTMENT_CD")
private String DEPARTMENT_CD;
/** 部门编码 **/
@JSONField(name = "ADD_DEPT_CODE")
private String ADD_DEPT_CODE;
@ -111,7 +114,7 @@ public class YunguanSaleOrderModel {
private String REP_ADS;
/** 制单人名称 **/
@JSONField(name = "ORD_REG_DTM")
private String ORD_REG_DTM;
private Date ORD_REG_DTM;
/** 制单时间 **/
@JSONField(name = "CREATE_EMP_ID")
private String CREATE_EMP_ID;
@ -126,8 +129,11 @@ public class YunguanSaleOrderModel {
private Date MODIFY_DTM;
/** 制单时间 **/
@JSONField(name = "ORD_CONF_DTM")
private String ORD_CONF_DTM;
private Date ORD_CONF_DTM;
/** 制单时间 **/
@JSONField(name = "CANCLE_YN")
private Date CANCLE_YN;
private String CANCLE_YN;
/** 行数 **/
@JSONField(name = "LINE_SUM")
private Integer LINE_SUM;
}

28
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOrderProductModel.java
Unescape View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class YunguanSaleOrderProductModel {
@ -73,4 +74,31 @@ public class YunguanSaleOrderProductModel {
/** 备注**/
@JSONField(name = "REMARKS1")
private BigDecimal REMARKS1;
/** 备注**/
@JSONField(name = "CREATE_EMP_ID")
private String CREATE_EMP_ID;
/** 备注**/
@JSONField(name = "CREATE_DTM")
private Date CREATE_DTM;
/** 备注**/
@JSONField(name = "CANCLE_YN")
private String CANCLE_YN;
/** 读取标记 **/
@JSONField(name = "READ_FLAG")
private String READ_FLAG;
/** 读取时间 **/
@JSONField(name = "READ_TIME")
private Date READ_TIME;
/** 错误信息 **/
@JSONField(name = "ERR_MESSAGE")
private String ERR_MESSAGE;
/** ESB是否传输 **/
@JSONField(name = "ESB_STATUS")
private String ESB_STATUS;
/** ESB传输时间 **/
@JSONField(name = "ESB_DTM")
private Date ESB_DTM;
/** ESB错误信息 **/
@JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE;
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleSettlementProductModel.java
Unescape View File

@ -67,13 +67,13 @@ public class YunguanSaleSettlementProductModel {
private String MAT_SIZE;
/** 销售单价 **/
@JSONField(name = "ORD_PRICE")
private String ORD_PRICE;
private BigDecimal ORD_PRICE;
/** 销售数量 **/
@JSONField(name = "ORD_QUANTITY")
private String ORD_QUANTITY;
private BigDecimal ORD_QUANTITY;
/** 结算数量 **/
@JSONField(name = "QUANTITY")
private String QUANTITY;
private BigDecimal QUANTITY;
/** 对应出库量 **/
@JSONField(name = "STO_OUT_WGT")
private BigDecimal STO_OUT_WGT;
@ -82,10 +82,10 @@ public class YunguanSaleSettlementProductModel {
private String UNIT;
/** 结算单价 **/
@JSONField(name = "INV_PRICE")
private String INV_PRICE;
private BigDecimal INV_PRICE;
/** 结算金额 **/
@JSONField(name = "INV_AMT")
private String INV_AMT;
private BigDecimal INV_AMT;
/** 税码 **/
@JSONField(name = "TAX_RATE")
private String TAX_RATE;
@ -94,10 +94,10 @@ public class YunguanSaleSettlementProductModel {
private String CURRENCY_TY;
/** 结算金额（外币） **/
@JSONField(name = "INV_AMT_FOREG")
private String INV_AMT_FOREG;
private BigDecimal INV_AMT_FOREG;
/** 结算汇率 **/
@JSONField(name = "INV_EXCHG_RAT")
private String INV_EXCHG_RAT;
private BigDecimal INV_EXCHG_RAT;
/** 开票商品名称 **/
@JSONField(name = "ITEM_NM_INV")
private String ITEM_NM_INV;
@ -152,4 +152,8 @@ public class YunguanSaleSettlementProductModel {
/** ESB错误信息 **/
@JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE;
/** 出库单号 **/
@JSONField(name = "CK_ORDER")
private String CK_ORDER;
}

15
jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue
Unescape View File

@ -1496,6 +1496,9 @@ export default {
}, {
"label": "名称",
"value": "subjectName"
}, {
"label": "所属业务线",
"value": "businessName"
},],
cwaccountcontractsubjectcolumnOptions: [{
"label": "主体名称",
@ -2324,7 +2327,9 @@ export default {
this.isEdit = false
this.childIndex = -1
},
addcwaccountcontractList() {
if (!this.dataForm.cwaccountsubjectList[0] || this.dataForm.cwaccountsubjectList[0].subjectId == '') {
this.$message({
type: 'error',
@ -2333,6 +2338,16 @@ export default {
})
return
}
if (this.dataForm.cwaccountcontractList.length >= 1) {
this.$message({
type: 'error',
message: '只能选一条合同',
duration: 1500,
})
return
}
let item = {
contractId: '',
contractPeriodTime: undefined,

20
jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
Unescape View File

@ -123,13 +123,31 @@
<el-table-column prop="accountAmount" label="对账合计（含税）" align="center" width="150">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
<!-- <el-table-column prop="creatorUserId" label="创建用户" align="center" width="150">
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
</el-table-column>
<el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
</el-table-column> -->
<el-table-column prop="creatorTime" label="创建时间" align="center" width="100" sortable>
<template slot-scope="scope">
{{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column prop="realName" label="创建用户" align="center">
</el-table-column>
<el-table-column prop="lastModifyTime" label="修改时间" align="center" width="100" sortable>
<template slot-scope="scope">
{{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column prop="realNameA" label="修改用户" align="center">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="150" align="center">

83
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
Unescape View File

@ -1322,38 +1322,33 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="事务处理类型"
prop="custTy">
<JnpfInput v-model="dataForm.custTy"
@change="changeData('settlableAmount',-1)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<jnpf-form-tip-item label="事务处理类型" prop="custTy">
<JnpfInput v-model="dataForm.custTy" @change="changeData('settlableAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="发票日期" prop="invoiceDate">
<JnpfDatePicker v-model="dataForm.invoiceDate" @change="changeData('startTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('settlableAmount')" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" :disabled="judgeWrite('settlableAmount')" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="发票张数"
prop="invoiceCnt">
<JnpfInputNumber v-model="dataForm.invoiceCnt"
@change="changeData('invoiceCnt', -1)" placeholder="请输入"
:disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
<jnpf-form-tip-item label="发票张数" prop="invoiceCnt">
<JnpfInputNumber v-model="dataForm.invoiceCnt" @change="changeData('invoiceCnt', -1)"
placeholder="请输入" :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
:style='{ "width": "100%" }'>
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="发票编号"
prop="invoiceNo">
<JnpfInput v-model="dataForm.invoiceNo"
@change="changeData('settlableAmount',-1)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<jnpf-form-tip-item label="发票编号" prop="invoiceNo">
<JnpfInput v-model="dataForm.invoiceNo" @change="changeData('settlableAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -1366,55 +1361,44 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="发票编号"
prop="attribute11">
<JnpfInput v-model="dataForm.attribute11"
@change="changeData('attribute11',-1)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<jnpf-form-tip-item label="发票编号" prop="attribute11">
<JnpfInput v-model="dataForm.attribute11" @change="changeData('attribute11',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="发票金额"
prop="invoiceAmount">
<JnpfInput v-model="dataForm.invoiceAmount"
@change="changeData('invoiceAmount',-1)" placeholder="请输入"
addonAfter="元" clearable :style='{"width":"100%"}'>
<jnpf-form-tip-item label="发票金额" prop="invoiceAmount">
<JnpfInput v-model="dataForm.invoiceAmount" @change="changeData('invoiceAmount',-1)"
placeholder="请输入" addonAfter="元" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="入账时间" prop="glDate">
<JnpfDatePicker v-model="dataForm.glDate" @change="changeData('startTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择"
:disabled="judgeWrite('settlableAmount')" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" :disabled="judgeWrite('settlableAmount')" clearable
:style='{"width":"100%"}' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="摘要"
prop="description">
<JnpfInput v-model="dataForm.description"
@change="changeData('settlableAmount',-1)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
<jnpf-form-tip-item label="摘要" prop="description">
<JnpfInput v-model="dataForm.description" @change="changeData('settlableAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="附件张数"
prop="annexCnt">
<JnpfInputNumber v-model="dataForm.annexCnt"
@change="changeData('annexCnt', -1)" placeholder="请输入"
:disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
<jnpf-form-tip-item label="附件张数" prop="annexCnt">
<JnpfInputNumber v-model="dataForm.annexCnt" @change="changeData('annexCnt', -1)"
placeholder="请输入" :disabled="judgeWrite('settlableAmount')" addonAfter="张" clearable
:style='{ "width": "100%" }'>
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8" v-if="judgeShow('applyAmount')">
<jnpf-form-tip-item label="申请金额" v-if="judgeShow('applyAmount')" prop="applyAmount">
<JnpfInput v-model="dataForm.applyAmount" @change="changeData('applyAmount',-1)" placeholder="请输入"
@ -1467,8 +1451,8 @@
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="开票商品名称" v-if="judgeShow('cwsettlementsummary-itemNmInv')" prop="itemNmInv"
align="center" width="200">
<el-table-column label="开票商品名称" v-if="judgeShow('cwsettlementsummary-itemNmInv')"
prop="itemNmInv" align="center" width="200">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('cwsettlementsummaryList-itemNmInv')">*</span>开票商品名称
@ -1480,8 +1464,8 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="摘要" v-if="judgeShow('cwsettlementsummary-description')" prop="description"
align="center" width="200">
<el-table-column label="摘要" v-if="judgeShow('cwsettlementsummary-description')"
prop="description" align="center" width="200">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('cwsettlementsummaryList-description')">*</span>摘要
@ -2146,6 +2130,9 @@ export default {
}, {
"label": "名称",
"value": "subjectName"
}, {
"label": "所属业务线",
"value": "businessName"
},],
cwsettlementaccounttypeOptions: [{
"fullName": "采购对账",
@ -2312,7 +2299,7 @@ export default {
invoiceTypeOptions: [{
"fullName": "红冲发票",
"id": "1"
},{
}, {
"fullName": "标准发票",
"id": "2"
}],

38
jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
Unescape View File

@ -144,6 +144,15 @@
</el-table-column>
<el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="200">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanTime" label="运管返回时间" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.yunguanTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="250" align="center">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@ -157,6 +166,9 @@
<el-button size="mini" type="text"
v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2"
@click="shoufukuanHandle(scope.row)">收付款</el-button>
<!-- <template v-if="scope.row.yunguanMark !== 'Y'">
<el-button size="mini" type="text" @click="repush(scope.row)">重新推送</el-button>
</template> -->
</template>
</el-table-column>
</JNPF-table>
@ -443,6 +455,32 @@ export default {
})
},
methods: {
repush(val) {
debugger
let orderType = ''
if (val.type == '采购结算') {
orderType = '6'
} else if (val.type == '销售结算') {
orderType = '7'
}
let param = {
id: val.id,
type: orderType
}
request({
url: `/api/scm/BusinessOrder/repush`,
method: 'get',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

32
jnpf-java-boot/jnpf-web/src/views/scm/bom/form.vue
Unescape View File

@ -48,6 +48,21 @@
</div>
<el-table :data="dataForm.bomItemList" size='mini' border>
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column label="物料编码" v-if="judgeShow('bomitem-creatorTime')" align="center"
prop="code">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('bomitemList-creatorTime')">*</span>物料编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code"
@change="changeData('bomitem-creatorTime', scope.$index)" placeholder="请输入"
disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="商品名称" v-if="judgeShow('bomitem-productId')" align="center"
fixed="left" prop="productId">
<template slot="header">
@ -149,6 +164,21 @@
</div>
<el-table :data="dataForm.bomItemValueList" size='mini' border="">
<el-table-column type="index" width="50" label="序号" align="center" fixed="left" />
<el-table-column label="物料编码" v-if="judgeShow('bomitemvalue-creatorUserId')"
align="center" prop="code">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('bomitemvalueList-creatorUserId')">*</span>物料编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code"
@change="changeData('bomitemvalue-creatorUserId', scope.$index)"
placeholder="请输入" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="商品名称" v-if="judgeShow('bomitemvalue-productId')"
align="center" fixed="left" prop="productId">
<template slot="header">
@ -668,6 +698,7 @@ export default {
productId: list.id,
name: list.name,
spec: list.spec,
code: list.code,
inventoryType: list.inventoryType,
inventoryTypes: list.inventoryTypes,
inventoryUnitIds: list.inventoryUnitIds,
@ -703,6 +734,7 @@ export default {
productId: e.id,
name: e.name,
spec: e.spec,
code: e.code,
inventoryType: e.inventoryType,
inventoryTypes: e.inventoryTypes,
inventoryUnitIds: e.inventoryUnitIds,

480
jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue
Unescape View File

@ -102,8 +102,7 @@
</jnpf-form-tip-item>
</template>
<template v-else>
<jnpf-form-tip-item label="*关联业务线" v-if="judgeShow('businessId')" prop="businessId"
class="reds">
<jnpf-form-tip-item label="关联业务线" v-if="judgeShow('businessId')" prop="businessId">
<JnpfPopupSelect v-model="dataForm.businessId"
@change="changeData('businessId', -1)" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.businessId" placeholder="请选择"
@ -501,111 +500,57 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('deliveryModel')">
<jnpf-form-tip-item
label="配送方式"
v-if="judgeShow('deliveryModel')"
prop="deliveryMethod"
>
<JnpfSelect
v-model="dataForm.deliveryMethod"
@change="changeData('deliveryModel', -1)"
placeholder="请选择"
:disabled="judgeWrite('deliveryModel')"
clearable
:style="{ width: '100%' }"
:options="deliveryMethodOptions"
:props="deliveryMethodProps"
>
<jnpf-form-tip-item label="配送方式" v-if="judgeShow('deliveryModel')"
prop="deliveryMethod">
<JnpfSelect v-model="dataForm.deliveryMethod"
@change="changeData('deliveryModel', -1)" placeholder="请选择"
:disabled="judgeWrite('deliveryModel')" clearable :style="{ width: '100%' }"
:options="deliveryMethodOptions" :props="deliveryMethodProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('deliveryLocation')">
<jnpf-form-tip-item
label="合同发货天数 "
v-if="judgeShow('deliveryLocation')"
prop="delvDays"
>
<JnpfInputNumber
v-model="dataForm.delvDays"
@change="changeData('deliveryLocation', -1)"
placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')"
clearable
:style="{ width: '100%' }"
:min="0"
>
<jnpf-form-tip-item label="合同发货天数 " v-if="judgeShow('deliveryLocation')"
prop="delvDays">
<JnpfInputNumber v-model="dataForm.delvDays"
@change="changeData('deliveryLocation', -1)" placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')" clearable :style="{ width: '100%' }"
:min="0">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('deliveryLocation')">
<jnpf-form-tip-item
label="合同汇率 "
v-if="judgeShow('deliveryLocation')"
prop="contrExRate"
>
<JnpfInputNumber
v-model="dataForm.contrExRate"
@change="changeData('deliveryLocation', -1)"
placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')"
clearable
:style="{ width: '100%' }"
:min="0"
>
<jnpf-form-tip-item label="合同汇率 " v-if="judgeShow('deliveryLocation')"
prop="contrExRate">
<JnpfInputNumber v-model="dataForm.contrExRate"
@change="changeData('deliveryLocation', -1)" placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')" clearable :style="{ width: '100%' }"
:min="0">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('deliveryLocation')">
<jnpf-form-tip-item
label="保证金 "
v-if="judgeShow('deliveryLocation')"
prop="margin"
>
<JnpfInputNumber
v-model="dataForm.margin"
@change="changeData('deliveryLocation', -1)"
placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')"
clearable
:style="{ width: '100%' }"
:min="0"
>
<jnpf-form-tip-item label="保证金 " v-if="judgeShow('deliveryLocation')" prop="margin">
<JnpfInputNumber v-model="dataForm.margin"
@change="changeData('deliveryLocation', -1)" placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')" clearable :style="{ width: '100%' }"
:min="0">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('deliveryModel')">
<jnpf-form-tip-item
label="销售类型"
v-if="judgeShow('deliveryModel')"
prop="salInvType"
>
<JnpfSelect
v-model="dataForm.salInvType"
@change="changeData('deliveryModel', -1)"
placeholder="请选择"
:disabled="judgeWrite('deliveryModel')"
clearable
:style="{ width: '100%' }"
:options="salInvTypeOptions"
:props="salInvTypeProps"
>
<jnpf-form-tip-item label="销售类型" v-if="judgeShow('deliveryModel')" prop="salInvType">
<JnpfSelect v-model="dataForm.salInvType" @change="changeData('deliveryModel', -1)"
placeholder="请选择" :disabled="judgeWrite('deliveryModel')" clearable
:style="{ width: '100%' }" :options="salInvTypeOptions" :props="salInvTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('deliveryLocation')">
<jnpf-form-tip-item
label="风险提示 "
v-if="judgeShow('deliveryLocation')"
prop="riskInfo"
>
<JnpfInput
v-model="dataForm.riskInfo"
@change="changeData('deliveryLocation', -1)"
placeholder="请输入"
:disabled="judgeWrite('deliveryLocation')"
clearable
:style="{ width: '100%' }"
>
<jnpf-form-tip-item label="风险提示 " v-if="judgeShow('deliveryLocation')" prop="riskInfo">
<JnpfInput v-model="dataForm.riskInfo" @change="changeData('deliveryLocation', -1)"
placeholder="请输入" :disabled="judgeWrite('deliveryLocation')" clearable
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -645,35 +590,22 @@
<jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.contractLCommodityList" size="mini">
<el-table-column type="index" width="50" label="序号" />
<el-table-column
label="行号"
v-if="judgeShow('contractlcommodity-priceRate')"
prop="contrLineId"
>
<el-table-column label="行号" v-if="judgeShow('contractlcommodity-priceRate')"
prop="contrLineId">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-priceRate')"
>*</span
>行号
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-priceRate')">*</span>行号
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.contrLineId"
@change="
<JnpfInput v-model="scope.row.contrLineId" @change="
changeData(
'contractlcommodityList-priceRate',
scope.$index
)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-priceRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
@ -775,275 +707,158 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="含税单价"
v-if="judgeShow('contractlcommodity-priceRate')"
prop="priceRate"
>
<el-table-column label="含税单价" v-if="judgeShow('contractlcommodity-priceRate')"
prop="priceRate">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-priceRate')"
>*</span
>含税单价
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-priceRate')">*</span>含税单价
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.priceRate"
@change="
<JnpfInput v-model="scope.row.priceRate" @change="
changeData(
'contractlcommodityList-priceRate',
scope.$index
)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-priceRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="不含税单价"
v-if="judgeShow('contractlcommodity-priceRate')"
prop="priceRateNo"
>
<el-table-column label="不含税单价" v-if="judgeShow('contractlcommodity-priceRate')"
prop="priceRateNo">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-priceRate')"
>*</span
>不含税单价
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-priceRate')">*</span>不含税单价
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.priceRateNo"
@change="
<JnpfInput v-model="scope.row.priceRateNo" @change="
changeData(
'contractlcommodityList-priceRate',
scope.$index
)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-priceRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="含税总金额"
v-if="judgeShow('contractlcommodity-totalRate')"
prop="totalRate"
>
<el-table-column label="含税总金额" v-if="judgeShow('contractlcommodity-totalRate')"
prop="totalRate">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')"
>*</span
>含税总金额
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>含税总金额
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.totalRate"
@change="
<JnpfInput v-model="scope.row.totalRate" @change="
changeData('contractlcommodity-totalRate', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-totalRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="不含税总金额"
v-if="judgeShow('contractlcommodity-totalRate')"
prop="amount"
>
<el-table-column label="不含税总金额" v-if="judgeShow('contractlcommodity-totalRate')"
prop="amount">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')"
>*</span
>不含税总金额
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>不含税总金额
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.amount"
@change="
<JnpfInput v-model="scope.row.amount" @change="
changeData('contractlcommodity-totalRate', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-totalRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="ERP税码"
v-if="judgeShow('contractlcommodity-totalRate')"
prop="taxRateCode"
>
<el-table-column label="ERP税码" v-if="judgeShow('contractlcommodity-totalRate')"
prop="taxRateCode">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')"
>*</span
>ERP税码
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>ERP税码
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.taxRateCode"
@change="
<JnpfInput v-model="scope.row.taxRateCode" @change="
changeData('contractlcommodity-totalRate', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-totalRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="上允差"
v-if="judgeShow('contractlcommodity-totalRate')"
prop="delvTolMax"
>
<el-table-column label="上允差" v-if="judgeShow('contractlcommodity-totalRate')"
prop="delvTolMax">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')"
>*</span
>上允差
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>上允差
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.delvTolMax"
@change="
<JnpfInput v-model="scope.row.delvTolMax" @change="
changeData('contractlcommodity-totalRate', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-totalRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="下允差"
v-if="judgeShow('contractlcommodity-totalRate')"
prop="delvTolMin"
>
<el-table-column label="下允差" v-if="judgeShow('contractlcommodity-totalRate')"
prop="delvTolMin">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')"
>*</span
>下允差
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>下允差
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.delvTolMin"
@change="
<JnpfInput v-model="scope.row.delvTolMin" @change="
changeData('contractlcommodity-totalRate', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-totalRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="计算方式"
v-if="judgeShow('contractlcommodity-procureUnit')"
prop="calculationMethod"
>
<el-table-column label="计算方式" v-if="judgeShow('contractlcommodity-procureUnit')"
prop="calculationMethod">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-procureUnit')"
>*</span
>计算方式
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-procureUnit')">*</span>计算方式
</template>
<template slot-scope="scope">
<JnpfSelect
v-model="scope.row.calculationMethod"
@change="
<JnpfSelect v-model="scope.row.calculationMethod" @change="
changeData(
'contractlcommodity-procureUnit',
scope.$index
)
"
placeholder="请选择"
:disabled="
" placeholder="请选择" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-procureUnit')
"
clearable
:style="{ width: '100%' }"
" clearable :style="{ width: '100%' }"
:options="contractlcommoditycalculationMethodOptions"
:props="contractlcommoditycalculationMethodProps"
>
:props="contractlcommoditycalculationMethodProps">
</JnpfSelect>
</template>
</el-table-column>
<el-table-column
label="备注"
v-if="judgeShow('contractlcommodity-totalRate')"
prop="remark"
>
<el-table-column label="备注" v-if="judgeShow('contractlcommodity-totalRate')"
prop="remark">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')"
>*</span
>备注
<span class="required-sign"
v-if="judgeRequired('contractlcommodityList-totalRate')">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.remark"
@change="
<JnpfInput v-model="scope.row.remark" @change="
changeData('contractlcommodity-totalRate', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlcommodityList') ||
judgeWrite('contractlcommodityList-totalRate')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
@ -1147,32 +962,19 @@
<jnpf-form-tip-item label-width="0">
<el-table :data="dataForm.contractLPaymentList" size="mini">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column
label="行号"
v-if="judgeShow('contractlpayment-remark')"
prop="indexs"
>
<el-table-column label="行号" v-if="judgeShow('contractlpayment-remark')"
prop="indexs">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlpaymentList-remark')"
>*</span
>行号
<span class="required-sign"
v-if="judgeRequired('contractlpaymentList-remark')">*</span>行号
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.indexs"
@change="
<JnpfInput v-model="scope.row.indexs" @change="
changeData('contractlpayment-remark', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlpaymentList') ||
judgeWrite('contractlpaymentList-remark')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
@ -1265,61 +1067,35 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="账期"
v-if="judgeShow('contractlpayment-remark')"
prop="accountingPeriod"
>
<el-table-column label="账期" v-if="judgeShow('contractlpayment-remark')"
prop="accountingPeriod">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlpaymentList-remark')"
>*</span
>账期
<span class="required-sign"
v-if="judgeRequired('contractlpaymentList-remark')">*</span>账期
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.accountingPeriod"
@change="
<JnpfInput v-model="scope.row.accountingPeriod" @change="
changeData('contractlpayment-remark', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlpaymentList') ||
judgeWrite('contractlpaymentList-remark')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column
label="收款后付款"
v-if="judgeShow('contractlpayment-remark')"
prop="payAfter"
>
<el-table-column label="收款后付款" v-if="judgeShow('contractlpayment-remark')"
prop="payAfter">
<template slot="header">
<span
class="required-sign"
v-if="judgeRequired('contractlpaymentList-remark')"
>*</span
>收款后付款
<span class="required-sign"
v-if="judgeRequired('contractlpaymentList-remark')">*</span>收款后付款
</template>
<template slot-scope="scope">
<JnpfInput
v-model="scope.row.payAfter"
@change="
<JnpfInput v-model="scope.row.payAfter" @change="
changeData('contractlpayment-remark', scope.$index)
"
placeholder="请输入"
:disabled="
" placeholder="请输入" :disabled="
judgeWrite('contractlpaymentList') ||
judgeWrite('contractlpaymentList-remark')
"
clearable
:style="{ width: '100%' }"
>
" clearable :style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
@ -1726,14 +1502,6 @@ export default {
trigger: "change"
}
],
businessId: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
relatedContractId: [
{
required: true,

39
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/form.vue
Unescape View File

@ -1453,7 +1453,7 @@ export default {
urgentOrderProps: { "label": "fullName", "value": "id" },
deliveryTypeOptions: [{ "fullName": "仓配", "id": "1" }, { "fullName": "直送", "id": "2" }],
deliveryTypeProps: { "label": "fullName", "value": "id" },
contractIdcolumnOptions: [{ "label": "合同编码", "value": "contractNumber" }, { "label": "合同名称", "value": "contractName" },],
contractIdcolumnOptions: [{ "label": "合同编码", "value": "contractNumber" }, { "label": "合同名称", "value": "contractName" }, { "label": "所属业务线", "value": "businessName" },],
contractIdcolumnOptions2: [{ "label": "合同编码", "value": "contract_number" }, { "label": "合同名称", "value": "contract_name" },],
currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }],
currencyProps: { "label": "fullName", "value": "id" },
@ -1614,6 +1614,43 @@ export default {
if (this.dataForm.orderType == '3') {
this.dataForm.contractId = undefined
}
debugger
let businessLine = this.dataForm.businessLineId;
let contractNumber = this.dataForm.purchaseContractNo;
let data;
if (businessLine != "") {
if (contractNumber == "" || contractNumber == undefined) {
} else {
// let businessLine = this.dataForm.businessLineId;
// let contractNumber = this.dataForm.purchaseContractNo;
let data = {
businessLine: this.dataForm.businessLineId,
contractNumber: this.dataForm.purchaseContractNo
}
request({
url: `/api/scm/BusinessOrder/getBusinessContractList`,
method: 'get',
data: data
}).then(res => {
var list = res.data;
this.dataForm.contractInfoList = list
this.dataForm.contractId = list[0].id
this.dataForm.contractName = list[0].contractName
console.log(this.dataForm.contractId);
console.log(this.dataForm.contractName);
console.log(this.dataForm.contractInfoList);
})
}
}
if (businessLine == "") {
this.dataForm.contractId = undefined
this.dataForm.contractName = undefined
this.dataForm.contractInfoList = undefined
}
},
//根据输入采购单价计算总价和不含税单价、不含税总价
priceCount(row) {

52
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
Unescape View File

@ -30,6 +30,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="对方合同号">
<el-input v-model="query.contractNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单重量">
<el-input v-model="query.businessNum" placeholder="请输入" clearable> </el-input>
@ -203,7 +209,6 @@
</el-table-column>
<el-table-column prop="realNameA" label="更新人" align="center" width="100">
</el-table-column>
<el-table-column prop="flowState" label="状态" width="100">
<template slot-scope="scope" v-if="!scope.row.top">
<el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
@ -214,6 +219,15 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanTime" label="运管返回时间" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.yunguanTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@ -234,7 +248,7 @@
<el-button size="mini" type="text"
@click="downLoadPDF(scope.row.code)">开票文件下载</el-button>
<el-button size="mini" type="text" @click="printPDF(scope.row.code)">打印</el-button>
<!-- <template v-if="scope.row.yunguanMark !== '200'">
<!-- <template v-if="scope.row.yunguanMark !== 'Y'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> -->
</template>
@ -326,6 +340,7 @@ export default {
status: undefined,
businessType: "1",
contractNumber: undefined,
contractNo: undefined,
},
treeProps: {
children: 'children',
@ -441,12 +456,25 @@ export default {
})
},
methods: {
// repush(id){
// let data = {
// id: id
// }
// },
repush(val) {
let param = {
id: val,
type: '1'
}
request({
url: `/api/scm/BusinessOrder/repush`,
method: 'get',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
downLoadPDF(code) {
window.open(
this.define.APIURl +
@ -468,6 +496,14 @@ export default {
})
},
inBoundNotice(row) {
// if (row.yunguanMark !== 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
const selectData = row
selectData.flag = '采购入库通知'
if (!this.inBoundFlowList.length) {

13
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
Unescape View File

@ -45,6 +45,15 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否生成销售发货凭证">
<JnpfSelect v-model="query.isSaleDeliveryVoucher" placeholder="请选择" clearable
:options="isSaleDeliveryVoucherOptions" :props="isSaleDeliveryVoucherProps">
</JnpfSelect>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="磅单编号">
@ -381,6 +390,8 @@ export default {
businessOrderNo: undefined,
creatorUserName: undefined,
productSpec: undefined,
isSaleDeliveryVoucher: undefined,
isTransfer: undefined,
},
treeProps: {
children: 'children',
@ -412,6 +423,8 @@ export default {
exportBoxVisible: false,
voucherTypeOptions: [{ "fullName": "磅单", "id": "1" }, { "fullName": "收据", "id": "2" }, { "fullName": "其他", "id": "3" }],
voucherTypeProps: { "label": "fullName", "value": "id" },
isSaleDeliveryVoucherOptions: [{ "fullName": "否", "id": "1" }, { "fullName": "是", "id": "2" }],
isSaleDeliveryVoucherProps: { "label": "fullName", "value": "id" },
modeTransportOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
modeTransportProps: { "label": "fullName", "value": "id" },
transportationMethodOptions: [{ "fullName": "仓库承运(DC)", "id": "1" }, { "fullName": "承运商", "id": "2" }, { "fullName": "供应商", "id": "3" }, { "fullName": "自提", "id": "4" }],

1009
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js
View File

File diff suppressed because one or more lines are too long

14
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
Unescape View File

@ -75,6 +75,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否关联销售订单">
<JnpfSelect v-model="query.isTransfer" placeholder="请选择" clearable
:options="isTransferOptions" :props="isTransferProps">
</JnpfSelect>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
@ -353,6 +361,7 @@ export default {
creatorUserName: undefined,
productSpec: undefined,
productName: undefined,
isTransfer: undefined,
},
treeProps: {
children: 'children',
@ -384,6 +393,8 @@ export default {
voucherTypeProps: { "label": "fullName", "value": "id" },
modeTransportOptions: [{ "fullName": "公路", "id": "1" }, { "fullName": "铁路", "id": "2" }, { "fullName": "轮船", "id": "3" }, { "fullName": "空运", "id": "4" }, { "fullName": "无", "id": "5" }],
modeTransportProps: { "label": "fullName", "value": "id" },
isTransferOptions: [{ "fullName": "否", "id": "1" }, { "fullName": "是", "id": "2" }],
isTransferProps: { "label": "fullName", "value": "id" },
transportationMethodOptions: [{ "fullName": "仓库承运(DC)", "id": "1" }, { "fullName": "承运商", "id": "2" }, { "fullName": "供应商", "id": "3" }, { "fullName": "自提", "id": "4" }],
transportationMethodProps: { "label": "fullName", "value": "id" },
voucherStatusOptions: [{ "fullName": "待提交", "id": "1" }, { "fullName": "待审核", "id": "2" }, { "fullName": "已驳回", "id": "3" }, { "fullName": "待确认", "id": "4" }, { "fullName": "待收货", "id": "5" }, { "fullName": "已完成", "id": "6" }, { "fullName": "已取消", "id": "7" }],
@ -802,6 +813,7 @@ export default {
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
@ -828,6 +840,7 @@ export default {
})
},
getExportList(list) {
debugger
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
@ -980,6 +993,7 @@ export default {
})
},
exportData() {
debugger
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)

2
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/superQueryJson.js
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
Unescape View File

@ -1347,7 +1347,7 @@ export default {
deliveryTypeProps: { "label": "fullName", "value": "id" },
externalSaleWayMethodOptions: [{ "fullName": "全款赊销", "id": "A" }, { "fullName": "预收款赊销", "id": "B" }, { "fullName": "预收全款或预收部分款", "id": "C" }, { "fullName": "款到发货，(定金订货，款到发货)", "id": "D" }],
externalSaleWayMethodProps: { "label": "fullName", "value": "id" },
contractIdcolumnOptions: [{ "label": "合同编码", "value": "contractNumber" }, { "label": "合同名称", "value": "contractName" },],
contractIdcolumnOptions: [{ "label": "合同编码", "value": "contractNumber" }, { "label": "合同名称", "value": "contractName" }, { "label": "所属业务线", "value": "businessName" },],
currencyOptions: [{ "fullName": "人民币", "id": "1" }, { "fullName": "港元", "id": "2" }, { "fullName": "美元", "id": "3" }, { "fullName": "欧元", "id": "4" }, { "fullName": "加币", "id": "5" }, { "fullName": "日元", "id": "6" }, { "fullName": "台币", "id": "7" }],
currencyProps: { "label": "fullName", "value": "id" },
saleModeOptions: [{ "fullName": "以销定采", "id": "1" }, { "fullName": "以采定销", "id": "2" }],

39
jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
Unescape View File

@ -169,6 +169,15 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanTime" label="运管返回时间" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.yunguanTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<!-- <template v-if="scope.row.deliveryType == '2' && scope.row.status == '1'">
@ -193,6 +202,9 @@
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="outBoundNotice(scope.row)">下发出库通知</el-button>
</template>
<!-- <template v-if="scope.row.yunguanMark !== 'Y'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> -->
</template>
</el-table-column>
</JNPF-table>
@ -392,7 +404,34 @@ export default {
})
},
methods: {
repush(val) {
let param = {
id: val,
type: '2'
}
request({
url: `/api/scm/BusinessOrder/repush`,
method: 'get',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
outBoundNotice(row) {
// if (row.yunguanMark !== 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
const selectData = row
selectData.flag = '销售出库通知'
if (!this.outBoundFlowList.length) {

31
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
Unescape View File

@ -127,6 +127,15 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanTime" label="运管返回时间" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.yunguanTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@ -138,6 +147,9 @@
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.yunguanMark !== 'Y'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> -->
</template>
</el-table-column>
</JNPF-table>
@ -278,6 +290,25 @@ export default {
})
},
methods: {
repush(val) {
let param = {
id: val,
type: '4'
}
request({
url: `/api/scm/BusinessOrder/repush`,
method: 'get',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

31
jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
Unescape View File

@ -133,6 +133,15 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanTime" label="运管返回时间" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.yunguanTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@ -144,6 +153,9 @@
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.yunguanMark !== 'Y'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> -->
</template>
</el-table-column>
</JNPF-table>
@ -343,6 +355,25 @@ export default {
})
},
methods: {
repush(val) {
let param = {
id: val,
type: '3'
}
request({
url: `/api/scm/BusinessOrder/repush`,
method: 'get',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

368
jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue
Unescape View File

@ -143,9 +143,9 @@
<jnpf-form-tip-item label="成品商品" v-if="judgeShow('productId')" prop="productId">
<JnpfPopupSelect v-model="dataForm.productId" @change="changeData1" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.productId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' field='productId' interfaceId="549582756464582469"
:pageSize="20" :columnOptions="productIdcolumnOptions" clearable
:pageSize="20" :hasPage="true" :columnOptions="productIdcolumnOptions" clearable
:disabled="judgeWrite('productId')" :style='{"width":"100%"}'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
@ -222,6 +222,20 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="编码" prop="code" width="200px" align="center">
<template slot="header">
<span class="required-sign">*</span>编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="inventoryUnitId" width="150px" align="center">
<template slot="header">
<span class="required-sign">*</span>库存单位
@ -316,76 +330,69 @@
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.cost"
@change="changeData('workorderproduct-cost', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.cost" @change="changeData('workorderproduct-cost', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="货区名称" v-if="judgeShow('workorderproduct-cargoId')"
align="center" prop="cargoId" width="180px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
</template>
<span class="required-sign" v-if="judgeRequired('workorderproductList-cargoId')">*</span>货区名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderproduct-cargoId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
interfaceId="530700536261903749" :pageSize="20"
:columnOptions="workorderproductcargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderproduct-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderproductcargoId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cargoId')"
interfaceId="530700536261903749" :pageSize="20"
:columnOptions="workorderproductcargoIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="成品批次号" v-if="judgeShow('workorderproduct-batchNumber')"
width="180px" prop="batchNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-batchNumber')">*</span>成品批次号
</template>
<span class="required-sign" v-if="judgeRequired('workorderproductList-batchNumber')">*</span>成品批次号
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('workorderproduct-cost', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('workorderproduct-cost', scope.$index)" placeholder="请输入" :disabled="true"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="备注" v-if="judgeShow('workorderproduct-remark')"
align="center" prop="remark" width="200px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderproductList-remark')">*</span>备注
</template>
<span class="required-sign" v-if="judgeRequired('workorderproductList-remark')">*</span>备注
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.remark"
@change="changeData('workorderproduct-remark', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-remark')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.remark"
@change="changeData('workorderproduct-remark', scope.$index)" placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-remark')"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50" v-if="!judgeWrite('workorderproductList')"
align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderproductList(scope.$index)">删除</el-button>
</template>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderproductList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -448,6 +455,20 @@
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="编码" prop="spec" width="200px" align="center">
<template slot="header">
<span class="required-sign">*</span>编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="inventoryUnitId" width="150px" align="center">
<template slot="header">
<span class="required-sign">*</span>库存单位
@ -553,7 +574,7 @@
<JnpfInput v-model="scope.row.batchNumber"
@change="changeData('workorderproduct-cost', scope.$index)"
placeholder="请输入"
:disabled="judgeWrite('workorderproductList') || judgeWrite('workorderproductList-cost')"
:disabled="true"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
@ -604,191 +625,192 @@
width="200px" align="center" fixed="left" prop="productId">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-productId')">*</span>原料商品名称
</template>
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-productId')">*</span>原料商品名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.productId" @change="changePrimaryList"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择"
disabled hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='name' :field="'productId' + scope.$index"
interfaceId="519505017699307077" :pageSize="20"
:columnOptions="workorderprimaryproductIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<JnpfPopupSelect v-model="scope.row.productId" @change="changePrimaryList"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderprimaryproductId" placeholder="请选择" disabled hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:field="'productId' + scope.$index" interfaceId="519505017699307077" :pageSize="20"
:columnOptions="workorderprimaryproductIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="存货类型" prop="productTypeId" align="center">
<template slot="header">
<span class="required-sign">*</span>存货类型
</template>
<span class="required-sign">*</span>存货类型
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.productTypeId" placeholder="请输入" disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.productTypeId" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="规格" prop="spec" align="center">
<template slot="header">
<span class="required-sign">*</span>规格
</template>
<span class="required-sign">*</span>规格
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.spec" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="编码" prop="spec" width="200px" align="center">
<template slot="header">
<span class="required-sign">*</span>编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.code" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="库存单位" prop="inventoryUnitId" align="center">
<template slot="header">
<span class="required-sign">*</span>库存单位
</template>
<span class="required-sign">*</span>库存单位
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.inventoryUnitId" placeholder="请输入" disabled
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.inventoryUnitId" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="条码" prop="deleteUserId" width="300px" align="center">
<template slot="header">
<span class="required-sign">*</span>条码
</template>
<span class="required-sign">*</span>条码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.barCode" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.barCode" placeholder="请输入" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="理论发料量(计算前)" v-if="judgeShow('workorderprimary-theoryNum')"
align="center" prop="theoryNum" width="300px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired(' workorderprimaryList-theoryNum')">*</span>理论发料量(计算前)
</template>
<span class="required-sign"
v-if="judgeRequired(' workorderprimaryList-theoryNum')">*</span>理论发料量(计算前)
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.theoryNum" disabled
@change="changeData('workorderprimary-theoryNum', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.theoryNum" disabled
@change="changeData('workorderprimary-theoryNum', scope.$index)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="理论发料量(计算后)" v-if="judgeShow('workorderprimary-itemsnum')"
align="center" prop="itemsnum" width="210px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-itemsnum')">*</span>理论发料量(计算后)
</template>
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-itemsnum')">*</span>理论发料量(计算后)
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.itemsnum"
v-if="dataForm.workOrderProductList[0].planNum !=''" disabled
@change="changeData('workorderprimary-theoryNum', scope.$index)"
placeholder="请输入计划加工数量" clearable :style='{ "width": "100%" }'>
</JnpfInput>
<JnpfInput v-model="scope.row.theoryNum" v-else disabled
@change="changeData('workorderprimary-theoryNum', scope.$index)"
placeholder="请输入计划加工数量" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.itemsnum" v-if="dataForm.workOrderProductList[0].planNum !=''"
disabled @change="changeData('workorderprimary-theoryNum', scope.$index)"
placeholder="请输入计划加工数量" clearable :style='{ "width": "100%" }'>
</JnpfInput>
<JnpfInput v-model="scope.row.theoryNum" v-else disabled
@change="changeData('workorderprimary-theoryNum', scope.$index)" placeholder="请输入计划加工数量"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="实际发料量" v-if="judgeShow('workorderprimary-realityNum')"
align="center" prop="realityNum" width="200px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>实际发料量
</template>
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-realityNum')">*</span>实际发料量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.realityNum"
@change="changeData('workorderprimary-realityNum', scope.$index)"
:disabled="judgeWrite('workorderprimaryList') || judgeWrite('workorderprimaryList-realityNum')"
placeholder="请输入1" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.realityNum"
@change="changeData('workorderprimary-realityNum', scope.$index)"
:disabled="judgeWrite('workorderprimaryList') || judgeWrite('workorderprimaryList-realityNum')"
placeholder="请输入1" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="原料返库数量" v-if="judgeShow('workorderprimary-returnNum')"
align="center" prop="returnNum" width="200px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-returnNum')">*</span>原料返库数量
</template>
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-returnNum')">*</span>原料返库数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.returnNum"
@change="changeData('workorderprimary-returnNum', scope.$index)"
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-returnNum')"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.returnNum"
@change="changeData('workorderprimary-returnNum', scope.$index)"
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-returnNum')"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="原料报损数量" v-if="judgeShow('workorderprimary-reportlossNum')"
align="center" prop="reportlossNum" width="200px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-reportlossNum')">*</span>原料报损数量
</template>
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-reportlossNum')">*</span>原料报损数量
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.reportlossNum"
@change="changeData('workorderprimary-reportlossNum', scope.$index)"
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-reportlossNum')"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
<JnpfInput v-model="scope.row.reportlossNum"
@change="changeData('workorderprimary-reportlossNum', scope.$index)"
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-reportlossNum')"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="货区名称" v-if="judgeShow('workorderprimary-cargoId')"
align="center" prop="cargoId" width="180px">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-cargoId')">*</span>货区名称
</template>
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-cargoId')">*</span>货区名称
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderprimary-cargoId', scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderprimarycargoId" placeholder="请选择" hasPage
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index"
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-cargoId')"
interfaceId="530700536261903749" :pageSize="20"
:columnOptions="workorderprimarycargoIdcolumnOptions" clearable
:style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
<JnpfPopupSelect v-model="scope.row.cargoId"
@change="changeData('workorderprimary-cargoId', scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderprimarycargoId" placeholder="请选择"
hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='cargo_name' :field="'cargoId' + scope.$index"
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-cargoId')"
interfaceId="530700536261903749" :pageSize="20"
:columnOptions="workorderprimarycargoIdcolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="批次号" v-if="judgeShow('workorderprimary-batchNumber')"
width="180px" prop="batchNumber">
<template slot="header">
<span class="required-sign"
v-if="judgeRequired('workorderprimaryList-batchNumber')">*</span>批次号
</template>
<span class="required-sign" v-if="judgeRequired('workorderprimaryList-batchNumber')">*</span>批次号
</template>
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.batchNumber"
@change="changeData('workorderprimary-batchNumber',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.workorderprimarybatchNumber" placeholder="请选择"
hasPage propsValue="batchNumber" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='batchNumber'
:disabled="judgeWrite('workorderprimaryList')||judgeWrite('workorderprimaryList-batchNumber')"
:field="'batchNumber'+scope.$index" interfaceId="550272582679552965"
:pageSize="20" :columnOptions="workorderprimarybatchNumbercolumnOptions"
clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</template>
<JnpfPopupSelect v-model="scope.row.batchNumber"
@change="changeData('workorderprimary-batchNumber',scope.$index)" :rowIndex="scope.$index"
:formData="dataForm" :templateJson="interfaceRes.workorderprimarybatchNumber" placeholder="请选择"
hasPage propsValue="batchNumber" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='batchNumber' :disabled="true" :field="'batchNumber'+scope.$index"
interfaceId="550272582679552965" :pageSize="20"
:columnOptions="workorderprimarybatchNumbercolumnOptions" clearable :style='{"width":"100%"}'>
</JnpfPopupSelect>
</template>
</el-table-column>
<!-- <el-table-column label="批次号选择" v-if="judgeShow('workorderprimary-batchNumber')"
@ -816,9 +838,9 @@
<el-table-column label="操作" width="50px" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderprimaryList(scope.$index)">删除</el-button>
</template>
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delworkorderprimaryList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -1003,13 +1025,7 @@ export default {
trigger: 'change'
},
],
teamId: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
productId: [
{
required: true,
@ -1042,7 +1058,7 @@ export default {
teamIdcolumnOptions: [{ "label": "班组编码", "value": "team_code" }, { "label": "班组名称", "value": "team_name" },],
warehouseIdcolumnOptions: [{ "label": "仓库名称", "value": "name" }, { "label": "仓库编码", "value": "code" },],
productIdcolumnOptions: [{ "label": "商品名称", "value": "name" }, { "label": "商品规格", "value": "spec" }, { "label": "库存单位", "value": "inventoryUnitId" },
{ "label": "商品简称", "value": "shortName" }, { "label": "商品条码", "value": "barCode" }],
{ "label": "商品简称", "value": "shortName" }, { "label": "商品编码", "value": "code" }],
workorderproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" },],
workorderproductunitIdcolumnOptions: [{ "label": "单位名称", "value": "unit_name" },],
@ -1131,6 +1147,7 @@ export default {
productId: e.productId,
productTypeId: e.productTypeId,
spec: e.spec,
code: e.code,
inventoryUnitId: e.inventoryUnitId,
barCode: e.barCode,
theoryNum: e.theoryNum,
@ -1151,19 +1168,19 @@ export default {
productId: e.productId,
productTypeId: e.productTypeId,
spec: e.spec,
code: e.code,
inventoryUnitId: e.inventoryUnitId,
realityNum: 0,
returnNum: 0,
reportlossNum: 0,
productTypeId: e.productTypeId,
spec: e.spec,
inventoryUnitId: e.inventoryUnitId,
unitId: e.inventoryUnitId,
barCode: e.barCode,
theoryNum: e.theoryNum,
itemsnum: e.itemsnum,
cargoId: e.cargoId,
batchNumber: "PZINPUT001",
// batchNumber: "PZINPUT001",
isInput: '2',
bomId: e.bomId,
}
@ -1435,7 +1452,7 @@ export default {
salesMainUnitIds: list.salesMainUnitIds,
unitId: list.inventoryUnitIds,
productTypeIds: list.productTypeId,
code: list.code,
spec: list.spec,
barCode: list.barCode,
inventoryUnitId: list.inventoryUnitIds,
@ -1488,6 +1505,7 @@ export default {
productTypeIds: e.productTypeId,
productName: e.name,
spec: e.spec,
code: e.code,
barCode: e.barCode,
inventoryUnitId: e.inventoryUnitIds,
productTypeId: e.inventoryType,

66
jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
Unescape View File

@ -121,12 +121,20 @@
<el-tag type="warning" v-else>等待提交</el-tag>
</template>
</el-table-column>
<el-table-column prop="yunguanMark" label="运管返回状态" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanMassage" label="运管返回信息" align="center" width="100">
</el-table-column>
<el-table-column prop="yunguanTime" label="运管返回时间" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.yunguanTime | toDate("yyyy-MM-dd") }}
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 2 && scope.row.type == 2" type="text"
@click="addOstarts(scope.row.id)" v-has="'btn_starts'">加工
@click="addOstarts(scope.row)" v-has="'btn_starts'">加工
</el-button>
<el-button v-if="scope.row.status == 3 && scope.row.type == 2 " type="text"
@ -134,7 +142,7 @@
</el-button>
<el-button v-if="scope.row.status == 3 || scope.row.status == 2" type="text"
@click="addOstartsRescind(scope.row.id)" v-has="'btn_starts'">取消加工
@click="addOstartsRescind(scope.row)" v-has="'btn_starts'">取消加工
</el-button>
<el-button type="text" :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
@ -146,6 +154,9 @@
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.yunguanMark !== 'Y'">
<el-button size="mini" type="text" @click="repush(scope.row.id)">重新推送</el-button>
</template> -->
</template>
</el-table-column>
</JNPF-table>
@ -289,6 +300,25 @@ export default {
})
},
methods: {
repush(val) {
let param = {
id: val,
type: '5'
}
request({
url: `/api/scm/BusinessOrder/repush`,
method: 'get',
data: param
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
@ -545,7 +575,16 @@ export default {
})
},
addOstarts(id, status) {
addOstarts(row, status) {
// if (row.yunguanMark !== 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
let id = row.id
this.$confirm("此操作将进行加工, 是否继续?", "提示", {
type: "warning",
})
@ -598,7 +637,16 @@ export default {
})
},
addOstartsRescind(id, status) {
addOstartsRescind(row, status) {
// if (row.yunguanMark !== 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
let id = row.id
this.$confirm("此操作将进行取消加工, 是否继续?", "提示", {
type: "warning",
})
@ -641,6 +689,14 @@ export default {
},
addOrUpdateHandleOver(row, isDetail) {
// if (row.yunguanMark !== 'Y') {
// this.$message({
// type: 'error',
// message: '运管暂未返回正常订单状态',
// duration: 1500,
// })
// return
// }
let id = row ? row.id : ""
this.formVisibleOver = true
this.$nextTick(() => {

Write Preview
Loading…
Cancel
Save