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

单据打印新增批次号打印，清单打印，解决服务端打印时出现乱码下划线问题

Browse Source
fencang
anthonyywj2 3 years ago
parent 3e8033f9f2
commit 5260230999
7 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File

5
api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -169,6 +169,7 @@ public class UdiContrastController {
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
udiRelevanceEntity.setSupName(combineRequest.getSupName()); udiRelevanceEntity.setSupName(combineRequest.getSupName());
udiRelevanceEntity.setPrice(combineRequest.getPrice()); udiRelevanceEntity.setPrice(combineRequest.getPrice());
UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId()); UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
@ -226,6 +227,8 @@ public class UdiContrastController {
combineRequest.setRelId(removeRelRequest.getRelId()); combineRequest.setRelId(removeRelRequest.getRelId());
udiRelevanceEntity.setSupName(""); udiRelevanceEntity.setSupName("");
udiRelevanceEntity.setPrice(""); udiRelevanceEntity.setPrice("");
udiRelevanceEntity.setManufactory("");
udiRelevanceEntity.setMeasname("");
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -277,6 +280,7 @@ public class UdiContrastController {
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid()); udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
if (combineRequest.getManufactory() != null) { if (combineRequest.getManufactory() != null) {
udiRelevanceEntity.setManufactory(combineRequest.getManufactory()); udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
} else } else
@ -313,6 +317,7 @@ public class UdiContrastController {
udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
udiRelevanceEntity.setMainName(thrProductsEntity.getName()); udiRelevanceEntity.setMainName(thrProductsEntity.getName());
udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname());
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
udiRelevanceEntity.setUpdateTime(time); udiRelevanceEntity.setUpdateTime(time);
udiRelevanceEntity.setModifyTime(time); udiRelevanceEntity.setModifyTime(time);

2
api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java
Unescape Escape View File

@ -473,8 +473,6 @@ public class StockQRCodeTextController {
} }
} }
return null; return null;
} }

1
api-admin/src/main/java/com/glxp/sale/admin/req/basic/CombineRequest.java
Unescape Escape View File

@ -21,6 +21,7 @@ public class CombineRequest {
private Long customerId; private Long customerId;
private Boolean supEnable; private Boolean supEnable;
private String manufactory; private String manufactory;
private String measname;
private String supName; private String supName;
private String price; private String price;
private boolean idSpliUdi; private boolean idSpliUdi;

2
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java
Unescape Escape View File

@ -137,6 +137,7 @@ public class BasicBackUpdateProductService {
udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4());
} }
udiRelevanceEntity1.setManufactory(invmandocResponse.getManufactory()); udiRelevanceEntity1.setManufactory(invmandocResponse.getManufactory());
udiRelevanceEntity1.setMeasname(invmandocResponse.getMeasname());
udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
udiRelevanceEntity1.setThirdName(invmandocResponse.getName()); udiRelevanceEntity1.setThirdName(invmandocResponse.getName());
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();
@ -243,6 +244,7 @@ public class BasicBackUpdateProductService {
} }
udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice()); udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory()); udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory());
udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
String time = DateUtil.getDateTime(); String time = DateUtil.getDateTime();

9
api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUpdateProductService.java
Unescape Escape View File

@ -101,7 +101,8 @@ public class BasicUpdateProductService {
udiRelevanceEntity1.setModifyTime(time); udiRelevanceEntity1.setModifyTime(time);
udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice()); udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory()); udiRelevanceEntity1.setManufactory(thrProductsEntity.getManufactory());
udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
String mainSys = basicThirdSysEntity.getThirdId(); String mainSys = basicThirdSysEntity.getThirdId();
if (mainSys.equals("thirdId")) { if (mainSys.equals("thirdId")) {
@ -177,7 +178,7 @@ public class BasicUpdateProductService {
udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice()); udiRelevanceEntity1.setPrice(thrProductsEntity.getPrice());
udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName()); udiRelevanceEntity1.setSupName(thrProductsEntity.getSupName());
udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory()); udiRelevanceEntity1.setManufactory(udiInfoEntity.getManufactory());
udiRelevanceEntity1.setMeasname(thrProductsEntity.getMeasname());
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
String mainSys = basicThirdSysEntity.getThirdId(); String mainSys = basicThirdSysEntity.getThirdId();
if (mainSys.equals("thirdId")) { if (mainSys.equals("thirdId")) {
@ -251,11 +252,11 @@ public class BasicUpdateProductService {
} }
} }
if (isAdd) { if (isAdd) {
udiRelevanceEntity.setId(gennerOrderUtils.getRelId()+""); udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
} }
} else { } else {
udiRelevanceEntity.setId(gennerOrderUtils.getRelId()+""); udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
} }
} }

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

@ -400,7 +400,7 @@
(id, (id,
thirdId,thirdName,uuid,isUseDy,updateTime, thirdId,thirdName,uuid,isUseDy,updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
) )
values values
( (
@ -429,7 +429,9 @@
#{lockStatus}, #{lockStatus},
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName},#{price} #{supName},
#{price},
#{modifyTime}
) )
</insert> </insert>
@ -442,7 +444,7 @@
(id, (id,
thirdId,thirdName,uuid,isUseDy,updateTime, thirdId,thirdName,uuid,isUseDy,updateTime,
thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock
,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price ,mainId,mainName,lockStatus,udplatCode,isAdavence,supName,price,modifyTime
) )
values values
( (
@ -472,7 +474,8 @@
#{udplatCode}, #{udplatCode},
#{isAdavence}, #{isAdavence},
#{supName}, #{supName},
#{price} #{price},
#{modifyTime}
) )
</insert> </insert>
@ -548,7 +551,7 @@
<insert id="importUdiRelevance" parameterType="java.util.List"> <insert id="importUdiRelevance" parameterType="java.util.List">
replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3, replace into basic_udirel (id, thirdId, thirdName, uuid, isUseDy, updateTime, thirdId1, thirdId2, thirdId3,
thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory, thirdId4, thirdName1, thirdName2, thirdName3, thirdName4, ybbm, sptm, manufactory,
measname, isDisable, mainId, mainName, udplatCode,supName,price) measname, isDisable, mainId, mainName, udplatCode,supName,price,modifyTime)
values values
<foreach collection="udiRelevanceEntities" item="item" index="index" separator=","> <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
(#{item.id}, (#{item.id},
@ -572,7 +575,7 @@
#{item.isDisable}, #{item.isDisable},
#{item.mainId}, #{item.mainId},
#{item.mainName}, #{item.mainName},
#{item.udplatCode},#{item.supName},#{item.price}) #{item.udplatCode},#{item.supName},#{item.price},#{item.modifyTime})
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

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

@ -263,7 +263,8 @@
stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate, 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.expireDate, stock_order_detail.count, stock_order_detail.sweepCount,
stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh, stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh,
stock_order_detail.price,inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms FROM stock_order stock_order_detail.price,inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms,basic_udirel.measname
FROM stock_order
INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
@ -287,10 +288,6 @@
<if test="invWarehouseCode != '' and invWarehouseCode!=null"> <if test="invWarehouseCode != '' and invWarehouseCode!=null">
and invWarehouseCode = #{invWarehouseCode} and invWarehouseCode = #{invWarehouseCode}
</if> </if>
<!-- <if test="userId!=null">-->
<!-- and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or-->
<!-- invWarehouseCode is null or invWarehouseCode='')-->
<!-- </if>-->
</where> </where>
group by stock_order_detail.id group by stock_order_detail.id
@ -300,14 +297,14 @@
<select id="listCodePrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest" <select id="listCodePrint" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
resultType="com.glxp.sale.admin.entity.inout.StockOrderPrintEntity"> resultType="com.glxp.sale.admin.entity.inout.StockOrderPrintEntity">
select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
spec spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count, basic_products.ylqxzcrbarmc,basic_products.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarmc,basic_products.manufactory,basic_products.measname,basic_products.zczbhhzbapzbh, inv_warehouse.name locInv,productinfo.spmc, basic_products.cpms
inv_warehouse.name locInv
from io_codes from io_codes
INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code`
left JOIN productinfo on productinfo.uuid = basic_products.originUuid
<where> <where>
<if test="orderId != '' and orderId !=null"> <if test="orderId != '' and orderId !=null">
and io_codes.orderId =#{orderId} and io_codes.orderId =#{orderId}

Write Preview
Loading…
Cancel
Save