Browse Source

Merge remote-tracking branch 'origin/master'

java8
常熟吴彦祖 10 months ago
parent
commit
3a89c235e7
  1. 6
      src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotify.java
  2. 5
      src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyDetail.java
  3. 19
      src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java
  4. 22
      src/main/resources/mapper/ecss/CoDelMapper.xml
  5. 10
      src/main/resources/mapper/ecss/EcssCommonMapper.xml

6
src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotify.java

@ -195,6 +195,12 @@ public class EcssCoDelNotify extends QueryPage {
*/
private String erpDelItemNo;
private String vat;
private String roll;
private String carton;
}

5
src/main/java/com/xujie/sys/modules/ecss/entity/EcssCoDelNotifyDetail.java

@ -154,6 +154,11 @@ public class EcssCoDelNotifyDetail extends QueryPage {
*/
private Integer erpDelItemNo;
private String vat;
private String roll;
private String carton;
}

19
src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@ -247,18 +247,21 @@ public class CoDelServiceImpl implements CoDelService {
task.setCmcInvoice(getStringCellValue(row, 11));
task.setCmcComment(getStringCellValue(row, 12));
task.setDestination(getStringCellValue(row, 13));
task.setSaleType(getStringCellValue(row, 14));
task.setAwbBl(getStringCellValue(row, 15));
task.setShippingNumber(getStringCellValue(row, 16));
task.setShippingMode(getStringCellValue(row, 17));
task.setSaleType(getStringCellValue(row, 16));
task.setAwbBl(getStringCellValue(row, 17));
task.setShippingNumber(getStringCellValue(row, 14));
task.setShippingMode(getStringCellValue(row, 15));
task.setForwarderInfo(getStringCellValue(row, 18));
task.setCurrency(getStringCellValue(row, 19));
task.setTp(getNumericCellValueOrDefault(row, 20));
task.setTtlAmount(getNumericCellValueOrDefault(row, 21));
task.setSumPrice(getNumericCellValueOrDefault(row, 22));
task.setUpc(getStringCellValue(row, 24));
task.setSo(getStringCellValue(row, 23));
task.setRemark(getStringCellValue(row, 25));
task.setVat(getStringCellValue(row, 22));
task.setSumPrice(getNumericCellValueOrDefault(row, 23));
task.setSo(getStringCellValue(row, 24));
task.setUpc(getStringCellValue(row, 25));
task.setRemark(getStringCellValue(row, 26));
task.setRoll(getStringCellValue(row, 27));
task.setCarton(getStringCellValue(row, 28));
task.setErpFlag("N");
task.setNotifyStatus("已计划");
task.setUsername(inData.getUsername());

22
src/main/resources/mapper/ecss/CoDelMapper.xml

@ -118,7 +118,7 @@
select a.site,a.bu_no,a.delNo,a.item_no,a.salesOrder,a.salesOrder_item_no,a.customerPO,a.line,a.version,a.status,a.family,
a.part_no,a.part_description,a.qty,a.lt,a.cmc_comment,a.saleType,a.awb_bl,a.shipping_number,a.forwarder_info,isnull(a.surplus_qty,0) surplusQty,
a.currency,a.tp,a.ttl_amount,a.sum_price,a.so,a.upc,a.remark,a.erp_delItemNo,a.pn,CONVERT(DECIMAL(20, 0),a.nocartons) as nocartons,
c.num_value as boxrolls,d.num_value as rollqty,w.num_value as boxweight,#{cmcInvoice} as cmcInvoice,a.modifyFlag,b.hsCodeDesc
c.num_value as boxrolls,d.num_value as rollqty,w.num_value as boxweight,#{cmcInvoice} as cmcInvoice,a.modifyFlag,b.hsCodeDesc,a.vat,a.roll,a.carton
from ecss_CoDelNotifydetail a
left join part b on a.site=b.site and a.part_no=b.part_no
left join part_sub_properties_value c on a.part_no=c.part_no and c.site=a.site and c.bu_no=a.bu_no
@ -175,13 +175,13 @@
insert into ecss_CoDelNotifyDetail (site,bu_no,delNo,item_no,salesOrder,salesOrder_item_no,customerPO,line,version,
status,family,part_no,part_description,qty,lt,cmc_comment,saleType,
awb_bl,shipping_number,forwarder_info,currency,tp,ttl_amount,sum_price,
so,upc,remark,pn,surplus_qty)
so,upc,remark,pn,surplus_qty,vat,roll,carton)
values
<foreach collection="list" separator="," item="item">
(#{item.site},#{item.buNo},#{item.delNo},#{item.itemNo,jdbcType=INTEGER},#{item.salesOrder},#{item.salesOrderItemNo},#{item.customerPO},#{item.line},#{item.version},
#{item.status},#{item.family},#{item.partNo},#{item.partDescription},#{item.qty,jdbcType=DECIMAL},#{item.lt,jdbcType=DECIMAL},#{item.cmcComment},#{item.saleType},
#{item.awbBl},#{item.shippingNumber},#{item.forwarderInfo},#{item.currency},#{item.tp,jdbcType=DECIMAL},#{item.ttlAmount,jdbcType=DECIMAL},#{item.sumPrice,jdbcType=DECIMAL},
#{item.so},#{item.upc},#{item.remark},#{item.pn},#{item.qty})
#{item.so},#{item.upc},#{item.remark},#{item.pn},#{item.qty},#{item.vat},#{item.roll},#{item.carton})
</foreach>
</insert>
@ -242,11 +242,11 @@
insert into ecss_CoDelNotifyDetail(site,bu_no,delNo,item_no,salesOrder,salesOrder_item_no,customerPO,line,version,
status,family,part_no,part_description,qty,lt,cmc_comment,saleType,
awb_bl,shipping_number,forwarder_info,currency,tp,ttl_amount,sum_price,
so,upc,remark,pn,modifyFlag,surplus_qty)
so,upc,remark,pn,modifyFlag,surplus_qty,vat,roll,carton)
values(#{site},#{buNo},#{delNo},#{itemNo,jdbcType=INTEGER},#{salesOrder},#{salesOrderItemNo},#{customerPO},#{line},#{version},
#{status},#{family},#{partNo},#{partDescription},#{qty,jdbcType=DECIMAL},#{lt,jdbcType=DECIMAL},#{cmcComment},#{saleType},
#{awbBl},#{shippingNumber},#{forwarderInfo},#{currency},#{tp,jdbcType=DECIMAL},#{ttlAmount,jdbcType=DECIMAL},#{sumPrice,jdbcType=DECIMAL},
#{so},#{upc},#{remark},#{pn},#{modifyFlag},#{qty})
#{so},#{upc},#{remark},#{pn},#{modifyFlag},#{qty},#{vat},#{roll},#{carton})
</insert>
<update id="updateEcssDelDetail">
@ -256,7 +256,7 @@
lt=#{lt,jdbcType=DECIMAL},cmc_comment=#{cmcComment},saleType=#{saleType},pn=#{pn},
awb_bl=#{awbBl},shipping_number=#{shippingNumber},forwarder_info=#{forwarderInfo},currency=#{currency},
tp=#{tp,jdbcType=DECIMAL},ttl_amount=#{ttlAmount,jdbcType=DECIMAL},sum_price=#{sumPrice,jdbcType=DECIMAL},
so=#{so},upc=#{upc},remark=#{remark},modifyFlag=#{modifyFlag},surplus_qty=#{qty}
so=#{so},upc=#{upc},remark=#{remark},modifyFlag=#{modifyFlag},surplus_qty=#{qty},vat=#{vat},roll=#{roll},carton=#{carton}
where
site=#{site} and delNo=#{delNo} and item_no=#{itemNo}
</update>
@ -887,13 +887,13 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
</select>
<select id="getCustomerList" resultType="java.util.Map">
select * from view_custdev_mes_cmc_customer where buse='是'
select * from ecss_custdev_mes_cmc_customer where buse='是'
</select>
<select id="getCustomerInfo" resultType="java.util.Map">
select DISTINCT vcus.ccusname,vcusp.ccontactname,vcusp.cnative
from view_custdev_mes_cmc_customer vcus
LEFT JOIN view_custdev_mes_cmc_customer_person vcusp on vcus.ccuscode=vcusp.ccuscode
from ecss_custdev_mes_cmc_customer vcus
LEFT JOIN ecss_custdev_mes_cmc_customer_person vcusp on vcus.ccuscode=vcusp.ccuscode
<where>
<if test="ccusname != null and ccusname != ''">
and vcus.ccusname=#{ccusname}
@ -906,8 +906,8 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
<select id="getCustomerAdd" resultType="java.util.Map">
select DISTINCT vcus.ccusname,vcusa.cDeliverAdd
from view_custdev_mes_cmc_customer vcus
left join view_custdev_mes_cmc_customer_addr vcusa on vcus.ccuscode=vcusa.ccuscode
from ecss_custdev_mes_cmc_customer vcus
left join ecss_custdev_mes_cmc_customer_addr vcusa on vcus.ccuscode=vcusa.ccuscode
where vcus.ccusname=#{ccusname}
</select>

10
src/main/resources/mapper/ecss/EcssCommonMapper.xml

@ -75,20 +75,20 @@
<select id="getCustomerInfo" resultType="java.util.Map">
select DISTINCT vcus.ccusname,vcusp.ccontactname,vcusp.cnative
from view_custdev_mes_cmc_customer vcus
LEFT JOIN view_custdev_mes_cmc_customer_person vcusp on vcus.ccuscode=vcusp.ccuscode
from ecss_custdev_mes_cmc_customer vcus
LEFT JOIN ecss_custdev_mes_cmc_customer_person vcusp on vcus.ccuscode=vcusp.ccuscode
where vcus.ccusname=#{ccusname}
</select>
<select id="getCustomerAdd" resultType="java.util.Map">
select DISTINCT vcus.ccusname,vcusa.cDeliverAdd,vcusa.cDeliverUnit, vcus.country,vcusa.deliverycountry
from view_custdev_mes_cmc_customer vcus
left join view_custdev_mes_cmc_customer_addr vcusa on vcus.ccuscode=vcusa.ccuscode
from ecss_custdev_mes_cmc_customer vcus
left join ecss_custdev_mes_cmc_customer_addr vcusa on vcus.ccuscode=vcusa.ccuscode
where vcus.ccusname=#{ccusname}
</select>
<select id="getCustomerList" resultType="java.util.Map">
select * from view_custdev_mes_cmc_customer
select * from ecss_custdev_mes_cmc_customer
<where>
<if test="ccusname != null and ccusname != ''">
and ccusname like '%'+#{ccusname}+'%'

Loading…
Cancel
Save