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

Merge branch 'fencang' into busUser

Browse Source
zhairh
anthonyywj2 3 years ago
parent 0c14fc6ac6 a27c44dd01
commit e5a9fddd61
6 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -811,6 +811,19 @@ public class WareHouseController {
} else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
return ResultVOUtils.error(500, "该产品不允许以使用单元入库！");
}
//计算实际数量
int actCount = 0;
if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) {
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
} else {
actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl();
}
} else {
actCount = udiRelevanceResponse.getBhzxxsbzsl();
}
warehouseEntity.setReCount(warehouseEntity.getCount() * actCount);
} else if (udiRelevanceResponses.size() == 0) {
if (unitFk == null)
return ResultVOUtils.error(500, "耗材字典不存在此产品！");
@ -818,7 +831,6 @@ public class WareHouseController {
return ResultVOUtils.error(500, "当前供应商不存在此配送产品！");
}
//校验供应商是否配送此产品
BaseResponse corpResponse = checkCorp(warehouseEntity, bussinessTypeEntity);
if (corpResponse != null) {

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

@ -47,10 +47,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

3
api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java
Unescape Escape View File

@ -18,7 +18,8 @@ public class WarehouseEntity {
private String produceDate;
private String expireDate;
private String serialNo;
private Integer count;
private Integer count; //扫码数量
private Integer reCount; //实际数量
private String packageLevel;
private String warehouseCode;

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

@ -41,7 +41,7 @@
<insert id="insertWarehouse" keyProperty="id" parameterType="com.glxp.sale.admin.req.inout.WarehouseSaveRequest">
INSERT INTO io_codes(action, mainAction, code, corpOrderId, actor, actDate,
fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate,
serialNo, count, packageLevel, warehouseCode, nameCode, supId, relId, status,
serialNo, count, reCount, packageLevel, warehouseCode, nameCode, supId, relId, status,
invStorageCode, invWarehouseCode, locStorageCode)
values (#{action},
#{mainAction},
@ -51,7 +51,7 @@
#{actDate},
#{fromCorpId},
#{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count},
#{packageLevel}, #{warehouseCode},
#{reCount}, #{packageLevel}, #{warehouseCode},
#{nameCode}, #{supId}, #{relId}, #{status}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode})
</insert>
@ -64,7 +64,7 @@
actor,
actDate,
fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,
serialNo,count,packageLevel,warehouseCode,nameCode,supId,
serialNo,count, reCount, packageLevel,warehouseCode,nameCode,supId,
relId,status,invStorageCode,invWarehouseCode,locStorageCode)
VALUES
<foreach collection="io_codesEntities" item="item" index="index"
@ -77,13 +77,11 @@
#{item.actor},
#{item.actDate},
#{item.fromCorpId},
#{
item.fromCorp
},#{item.orderId},#{item.batchNo}
#{item.fromCorp},#{item.orderId},#{item.batchNo}
,#{item.produceDate}
,#{item.expireDate}
,#{item.serialNo}
,#{item.count}
,#{item.count}, #{item.reCount}
,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId}
,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode})
@ -168,6 +166,7 @@
<if test="fromCorp != null">fromCorp=#{fromCorp},</if>
<if test="fromCorpId != null">fromCorpId=#{fromCorpId},</if>
<if test="count != null">`count`=#{count},</if>
<if test="reCount != null">`reCount`=#{reCount},</if>
<if test="status != null">status=#{status},</if>
<if test="serialNo != null">`serialNo`=#{serialNo},</if>
<if test="supId != null">supId=#{supId},</if>

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

@ -14,7 +14,7 @@
(action, mainAction,code, corpOrderId, actor,actDate,
fromCorpId, fromCorp,
orderId,batchNo,produceDate,expireDate,serialNo,
count,nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId)
count, reCount, nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId)
VALUES
<foreach collection="codes" item="item" index="index"
separator=",">
@ -32,7 +32,9 @@
,#{item.produceDate}
,#{item.expireDate}
,#{item.serialNo}
,#{item.count},#{item.nameCode},#{item.supId},
,#{item.count},
#{item.reCount},
#{item.nameCode},#{item.supId},
#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode},#{item.relId}
)
</foreach>
@ -43,7 +45,7 @@
parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
INSERT INTO io_codes_temp(action, mainAction, code, corpOrderId, actor, actDate,
fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
count, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
count, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
values (#{action},
#{mainAction},
#{code},
@ -57,14 +59,16 @@
#{produceDate},
#{expireDate},
#{serialNo},
#{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
#{count},
#{reCount},
#{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
</insert>
<insert id="replaceCodesTempSingle" keyProperty="id"
parameterType="com.glxp.sale.admin.entity.inout.WarehouseEntity">
replace INTO io_codes_temp(id,action, mainAction, code, corpOrderId, actor, actDate,
fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
count, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
count, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
values (#{id},#{action},
#{mainAction},
#{code},
@ -78,7 +82,9 @@
#{produceDate},
#{expireDate},
#{serialNo},
#{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
#{count},
#{reCount},
#{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
</insert>
<select id="findByOrderId" parameterType="com.glxp.sale.admin.req.inout.WarehouseQueryRequest"
@ -118,6 +124,7 @@
UPDATE io_codes_temp
<set>
<if test="count != null">`count`=#{count},</if>
<if test="reCount != null">`reCount`=#{reCount},</if>
<if test="action != null">`action`=#{action},</if>
<if test="mainAction != null">`mainAction`=#{mainAction},</if>
<if test="fromCorpId != null">`fromCorpId`=#{fromCorpId},</if>
@ -148,6 +155,7 @@
<if test="serialNo != null">`serialNo`=#{serialNo},</if>
<if test="relId != null">`relId`=#{relId},</if>
<if test="count != null">`count`=#{count},</if>
<if test="reCount != null">`reCount`=#{reCount},</if>
</set>
WHERE id=#{id}
</update>

3
api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
Unescape Escape View File

@ -239,6 +239,9 @@
<if test="invStorageCode != '' and invStorageCode != null">
AND invStorageCode like concat('%', #{invStorageCode,jdbcType=VARCHAR}, '%')
</if>
<if test="invWarehouseCode != '' and invWarehouseCode != null">
AND invWarehouseCode like concat('%', #{invWarehouseCode,jdbcType=VARCHAR}, '%')
</if>
<if test="batchNo != '' and batchNo != null">
AND ip.batchNo like concat('%', #{batchNo,jdbcType=VARCHAR}, '%')
</if>

Write Preview
Loading…
Cancel
Save