UDI
/
udiwms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自助平台代码合并

Browse Source
fengcang
anthonyywj2 3 years ago
parent f1e7f2e00e
commit 76a6e63620
8 changed files with 96 additions and 77 deletions
Show Stats Download Patch File Download Diff File

9
api-admin/src/main/java/com/glxp/api/admin/entity/basic/ProductInfoEntity.java
Unescape Escape View File

@ -58,4 +58,13 @@ public class ProductInfoEntity {
private String cplx;
private String hchzsb;
private String sfwblztlcp;
private String cgzmraqxgxx;
private String sfbjwycxsy;
private String zdcfsycs;
private String sfwwjbz;
private String syqsfxyjxmj;
private String qtxxdwzlj;
private String mjfs;
}

1
api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
Unescape Escape View File

@ -54,5 +54,6 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
private String serialNo; //序列号
private String nameCode;
private String billRemark;
private String deptName;
}

2
api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java
Unescape Escape View File

@ -46,4 +46,6 @@ public class OrderFilterRequest extends ListPageRequest {
private Integer entrustId;
private boolean entrust;
private String invWarehouseCode;
}

1
api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java
Unescape Escape View File

@ -9,6 +9,7 @@ public class UdiTraceResponse {
private String actDate;
private String mainAction;
private String action;
private String actionName;
private String fromCorp;
private Integer count;
private String cpmctymc;

1
api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java
Unescape Escape View File

@ -121,7 +121,6 @@ public class UdiContrastService {
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource

86
api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
Unescape Escape View File

@ -268,48 +268,6 @@
<![CDATA[ DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S')
]]>
</select>
<!--<select id="filterUdi" parameterType="com.glxp.sync.admin.req.ProductInfoFilterRequest"-->
<!--resultType="com.glxp.sync.admin.entity.udi.ProductInfoEntity">-->
<!--&#45;&#45; GROUP BY deviceRecordKey-->
<!--select p.* from productinfo p INNER JOIN-->
<!--(select deviceRecordKey ,max(versionNumber) versionNumber from productinfo-->
<!--<where>-->
<!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">-->
<!--AND ylqxzcrbarmc= #{ylqxzcrbarmc}-->
<!--</if>-->
<!--<if test="ylqxzcrbarmc == '' and ylqxzcrbarmc == null and cpmctymc != '' and cpmctymc != null">-->
<!--AND cpmctymc LIKE concat(#{cpmctymc},'%')-->
<!--</if>-->
<!--<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">-->
<!--AND cpmctymc LIKE concat('%',#{cpmctymc},'%')-->
<!--</if>-->
<!--<if test="nameCode != '' and nameCode != null">-->
<!--AND nameCode LIKE concat(#{nameCode},'%')-->
<!--</if>-->
<!--<if test="uuid != '' and uuid != null">-->
<!--AND uuid = #{uuid}-->
<!--</if>-->
<!--<if test="ggxh != '' and ggxh != null">-->
<!--AND ggxh LIKE concat('%',#{ggxh},'%')-->
<!--</if>-->
<!--<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">-->
<!--AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')-->
<!--</if>-->
<!--<if test="deviceRecordKey != '' and deviceRecordKey != null">-->
<!--AND deviceRecordKey = #{deviceRecordKey}-->
<!--</if>-->
<!--<if test="updateTime!=null and updateTime!=''">-->
<!--<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]>-->
<!--</if>-->
<!--</where>-->
<!--GROUP BY deviceRecordKey)-->
<!--a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber-->
<!--</select>-->
<select id="syncDlUdi" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
resultType="com.glxp.api.admin.entity.basic.ProductInfoEntity">
@ -355,7 +313,8 @@
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
)
values
(
@ -396,7 +355,18 @@
#{cpms},
#{cpbsbmtxmc},
#{isNewest},
#{updateTime}
#{updateTime},
#{hchzsb},
#{cplx},
#{hchzsb},
#{sfwblztlcp},
#{cgzmraqxgxx},
#{sfbjwycxsy},
#{zdcfsycs},
#{sfwwjbz},
#{syqsfxyjxmj},
#{qtxxdwzlj},
#{mjfs}
)
</insert>
@ -409,7 +379,8 @@
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime
ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
) values
<foreach collection="datas" item="item" index="index"
@ -454,7 +425,8 @@
#{item.cpms},
#{item.cpbsbmtxmc},
#{item.isNewest},
#{item.updateTime}
#{item.updateTime},#{item.cplx},#{item.hchzsb},#{item.sfwblztlcp},#{item.cgzmraqxgxx},#{item.sfbjwycxsy},#{item.zdcfsycs}
,#{item.sfwwjbz},#{item.syqsfxyjxmj},#{item.qtxxdwzlj},#{item.mjfs}
)
</foreach>
</insert>
@ -502,6 +474,17 @@
<if test="diType != null">diType=#{diType},</if>
<if test="isNewest != null">isNewest=#{isNewest},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="cplx != null">cplx=#{cplx},</if>
<if test="hchzsb != null">hchzsb=#{hchzsb},</if>
<if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
<if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
<if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
<if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
<if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
<if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
</if>
<if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
<if test="mjfs != null">mjfs=#{mjfs},</if>
</set>
WHERE id = #{id}
@ -521,6 +504,17 @@
<if test="cpbsbmtxmc != null">cpbsbmtxmc=#{cpbsbmtxmc},</if>
<if test="isNewest != null">isNewest=#{isNewest},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="hchzsb != null">hchzsb=#{hchzsb},
</if>
<if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
<if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
<if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
<if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
<if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
<if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
</if>
<if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
<if test="mjfs != null">mjfs=#{mjfs},</if>
</set>
WHERE uuid = #{uuid}
</update>

68
api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
Unescape Escape View File

@ -200,6 +200,14 @@
<if test="endTime!=null and endTime!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]>
</if>
<if test="startDate!=null and startDate!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d')>= DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]>
</if>
<if test="endDate!=null and endDate!=''">
<![CDATA[ and DATE_FORMAT(billdate, '%Y-%m-%d') <= DATE_FORMAT(#{endDate}, '%Y-%m-%d') ]]>
</if>
<if test="userId!=null">
and inv_warehouse_user.userId =#{userId}
</if>
@ -270,11 +278,12 @@
<select id="listOrderPrint" parameterType="com.glxp.api.admin.req.business.StockOrderFilterRequest"
resultType="com.glxp.api.admin.entity.business.StockOrderPrintEntity">
SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName, stock_order_detail.spec,
stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate,
stock_order_detail.count, stock_order_detail.sweepCount,
stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory,
stock_order_detail.zczbhhzbapzbh,stock_order_detail.price,inv_warehouse.name locInv
SELECT stock_order.*, stock_order_detail.productId, stock_order_detail.productName,
stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate,
stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc,
basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName
,basic_products.spmc
FROM stock_order INNER JOIN
stock_order_detail on
@ -285,6 +294,7 @@
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
left join basic_udirel on stock_order_detail.productId = basic_udirel.id
INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
left join auth_dept on stock_order.dept = auth_dept.`code`
<where>
<if test="id != '' and id!=null">
and stock_order.id =#{id}
@ -333,20 +343,17 @@
</select>
<select id="selectSupplementOrderList" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
SELECT
billNo, orderIdFk, `status`
FROM
stock_order
WHERE
( supplementNo IS NULL OR supplementNo = '' )
SELECT billNo,
orderIdFk,
`status`
FROM stock_order
WHERE (supplementNo IS NULL OR supplementNo = '')
AND billType IN (
SELECT
localAction
FROM
basic_bussiness_type
WHERE
supplementOrderType IS NOT NULL
OR supplementOrderType != '')
SELECT localAction
FROM basic_bussiness_type
WHERE supplementOrderType IS NOT NULL
OR supplementOrderType
!= '')
</select>
<select id="findById" resultType="com.glxp.api.admin.entity.business.StockOrderEntity">
@ -369,17 +376,17 @@
select id
from stock_order
where billNo in (
select erpFk
from io_order
where erpFk in
(select billNo
from stock_order
where stock_order.billType in (select code from basic_third_sys_bus_api))
and exportStatus = 0
)
select erpFk
from io_order
where erpFk in
(select billNo
from stock_order
where stock_order.billType in (select code from basic_third_sys_bus_api))
and exportStatus = 0
)
</select>
<select id="selectIdByOrderIdFk" resultType="java.lang.Integer">
<select id="selectIdByOrderIdFk" resultType="java.lang.Integer">
select id
from stock_order
where orderIdFk = #{orderIdFk}
@ -389,7 +396,8 @@
select t1.* from stock_order t1 left join io_order t2 on t1.billNo = t2.erpFk
<where>
<if test="request.billNo != null and request.billNo != ''">
AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like concat('%',#{request.billNo},'%'))
AND (t2.erpFk like concat('%', #{request.billNo}, '%') or t2.thirdBillNo like
concat('%',#{request.billNo},'%'))
</if>
<if test="request.submitStatus != null">
AND t2.exportStatus = #{request.submitStatus}
@ -419,6 +427,8 @@
order by t1.billdate desc
</select>
<select id="findBillTypeById" resultType="java.lang.String">
select billType from stock_order where id = #{id}
select billType
from stock_order
where id = #{id}
</select>
</mapper>

5
api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
Unescape Escape View File

@ -289,7 +289,10 @@
<select id="filterList" parameterType="com.glxp.api.admin.req.inout.OrderFilterRequest"
resultType="com.glxp.api.admin.entity.inout.OrderEntity">
SELECT io_order.* FROM io_order
SELECT io_order.* ,
inv_warehouse.name as invName,
inv_warehouse_sub.name as subInvName
FROM io_order
LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`

Write Preview
Loading…
Cancel
Save