Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wms成品销售出库生成备货单修改，前端选择一个单子，生成所以项，并且根据对应的库存，没有库存的进行提示，限制无限生成，添加配置数量字段

Browse Source
master
mengjiao 3 months ago
parent ef441a5676
commit 36cf3ed508
7 changed files with 127 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
op-modules/op-wms/src/main/java/com/op/wms/controller/WmsSellOutEmbryoController.java
Unescape Escape View File

@ -146,8 +146,6 @@ public class WmsSellOutEmbryoController extends BaseController {
return R.ok();
}
@PostMapping("/addRE")
public AjaxResult addRE(@RequestBody List<WmsSellOutEmbryo> wmsSellOutEmbryoList) {
return success(wmsSellOutEmbryoService.addRE(wmsSellOutEmbryoList));

2
op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsFpStorageNewsSnMapper.java
Unescape Escape View File

@ -97,4 +97,6 @@ public interface WmsFpStorageNewsSnMapper {
List<WmsFpStorageNewsSn> selectwmsFpStorageNewsGroupWaCode(@Param("productCode")String productCode);
List<WmsFpStorageNewsSn> selectWmsFpStorageNewsSnRecordsList(WmsFpStorageNewsSn wmsFpStorageNewsSn);
void updateWmsFpStorageNewsSnsetZT(WmsFpStorageNewsSn wmsFpStorageNewsSn1);
}

5
op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.op.wms.mapper;
import java.math.BigDecimal;
import java.util.List;
import com.op.wms.domain.WmsAllocationOutEmbryo;
@ -105,4 +106,8 @@ public interface WmsSellOutEmbryoMapper {
public WmsSellOutEmbryo selectWmsSellOutEmbryoByIdRE(String id);
List<WmsSellOutEmbryo> selectWmsSellOutEmbryoListRE(WmsSellOutEmbryo wmsSellOutEmbryo);
void updateWmsSellOutEmbryoAddOut(@Param("wmsSellOutEmbryo")WmsSellOutEmbryo wmsSellOutEmbryo,@Param("planQuantity") BigDecimal planQuantity);
List<WmsSellOutEmbryo> selectWmsSellOutEmbryoListZT(WmsSellOutEmbryo wmsSellOutEmbryo1);
}

1
op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java
Unescape Escape View File

@ -872,6 +872,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsFpStorageNewsSn1.setActiveFlag("1");
wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode());
wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1);
wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnsetZT(wmsFpStorageNewsSn1);
WmsFpStorageNewsSn wmsFpStorageNewsSn2= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId());
WmsFpStorageNewsSn wmsFpStorageNewsSn3=new WmsFpStorageNewsSn();
wmsFpStorageNewsSn3.setStorageId(IdUtils.fastSimpleUUID());

106
op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsSellOutEmbryoServiceImpl.java
Unescape Escape View File

@ -162,23 +162,62 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
return wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoREList(wmsSellOutEmbryo);
}
/**
* 在原来的基础上修改改成，让他们前端进行操作，只选择一个单号即可，
* @param wmsSellOutEmbryoList
* @return
*/
@Override
@DS("#header.poolName")
public String addRE(List<WmsSellOutEmbryo> wmsSellOutEmbryoList) {
String result="完成";
String stockOrder="BH";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
//TH ods_procure_order_card
Date date = new Date();
String formattedDate = dateFormat.format(date);
//销售出库界面同一笔交货单可以生成多笔备货单，无限制，进行限制，防止重复生成---即要对wms_sell_out_embryo页面进行修改
String result="";
Integer ten=0;
List<WmsSellOutEmbryo> wmsSellOutEmbryos=new ArrayList<>();
for (WmsSellOutEmbryo wmsSellOutEmbryo:
wmsSellOutEmbryoList) {
WmsSellOutEmbryo wmsSellOutEmbryo1= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId());
String productCode =wmsSellOutEmbryo1.getProductCode();
BigDecimal planQuantity = wmsSellOutEmbryo1.getPlanQuantity();
wmsSellOutEmbryo1.getDeliveryOrder();
wmsSellOutEmbryos.add(wmsSellOutEmbryo1);
}
//去重
// 创建一个 HashSet 用于存储已经遇到的交付订单号，以便进行去重
Set<String> deliveryOrderSet = new HashSet<>();
List<WmsSellOutEmbryo> wmsSellOutEmbryoList1=new ArrayList<>();
for (WmsSellOutEmbryo wmsSellOutEmbryo:
wmsSellOutEmbryos){
String wmsSellOutEmbryoDeliveryOrder= wmsSellOutEmbryo.getDeliveryOrder();
// 检查交付订单号是否已经存在于 deliveryOrderSet 中
if (!deliveryOrderSet.contains(wmsSellOutEmbryoDeliveryOrder)) {
// 如果交付订单号不存在，则将其添加到 deliveryOrderSet 中
deliveryOrderSet.add(wmsSellOutEmbryoDeliveryOrder);
// 将当前 WmsSellOutEmbryo 对象添加到 wmsSellOutEmbryoList1 中
wmsSellOutEmbryoList1.add(wmsSellOutEmbryo);
}
}
for (WmsSellOutEmbryo wmsSellOutEmbryo:
wmsSellOutEmbryoList1) {
//选一个单子，把单子的全部项都生成
WmsSellOutEmbryo wmsSellOutEmbryo1=new WmsSellOutEmbryo();
wmsSellOutEmbryo1.setDeliveryOrder(wmsSellOutEmbryo.getDeliveryOrder());
List<WmsSellOutEmbryo> wmsSellOutEmbryoList2= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListZT(wmsSellOutEmbryo1);
// String stockOrder="BH";
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
Date date = new Date();
String formattedDate = dateFormat.format(date);
//wmsSellOutEmbryoList2是我根据入参去重后，查询出来的所有数据
for (WmsSellOutEmbryo wmsSellOutEmbryo2:
wmsSellOutEmbryoList2) {
String productCode =wmsSellOutEmbryo2.getProductCode();
BigDecimal planQuantity = wmsSellOutEmbryo2.getPlanQuantity();
List<WmsFpStorageNewsSn> wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectwmsFpStorageNewsGroupWaCode(productCode);
if (wmsFpStorageNewsSns.size()<1){
return productCode+"无库存";
if (wmsFpStorageNewsSns.size()<1){//没有库存，就就跳过，但是要记录，对前端进行提示
ten= ten+1;
result=result+","+productCode;
continue;
}
String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate);
//区分大小planQuantity
@ -187,21 +226,48 @@ public class WmsSellOutEmbryoServiceImpl implements IWmsSellOutEmbryoService {
//planQuantity看成总数量
if(planQuantity.compareTo(tem)<=0){
//生成一个
wmsSellOutEmbryo1.setStockOrder("BH"+stock);
wmsSellOutEmbryo1.setWaCode(wmsFpStorageNewsSn.getWaCode());
wmsSellOutEmbryo1.setPlanQuantity(planQuantity);
wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID());
wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo1);
wmsSellOutEmbryoMapper.updateWmsSellOutEmbryoAddOut(wmsSellOutEmbryo2,planQuantity);//对订单进行修改--添加出库数量
wmsSellOutEmbryo2.setStockOrder("BH"+stock);
wmsSellOutEmbryo2.setWaCode(wmsFpStorageNewsSn.getWaCode());
wmsSellOutEmbryo2.setPlanQuantity(planQuantity);
wmsSellOutEmbryo2.setId(IdUtils.fastSimpleUUID());
wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo2);
return result;
}else {
wmsSellOutEmbryo1.setStockOrder("BH"+stock);
wmsSellOutEmbryoMapper.updateWmsSellOutEmbryoAddOut(wmsSellOutEmbryo2,tem);
wmsSellOutEmbryo2.setStockOrder("BH"+stock);
planQuantity = planQuantity.subtract(tem); // 用总数量减去tem，更新planQuantity的值
wmsSellOutEmbryo1.setWaCode(wmsFpStorageNewsSn.getWaCode()); // 设置wmsSellOutEmbryo1的waCode为当前wmsFpStorageNewsSn的waCode
wmsSellOutEmbryo1.setPlanQuantity(tem); // 将tem的值赋给wmsSellOutEmbryo1的planQuantity
wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); // 生成一个唯一ID并设置到wmsSellOutEmbryo1的ID字段
wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo1); // 将wmsSellOutEmbryo1插入到数据库
wmsSellOutEmbryo2.setWaCode(wmsFpStorageNewsSn.getWaCode()); // 设置wmsSellOutEmbryo2的waCode为当前wmsFpStorageNewsSn的waCode
wmsSellOutEmbryo2.setPlanQuantity(tem); // 将tem的值赋给wmsSellOutEmbryo2的planQuantity
wmsSellOutEmbryo2.setId(IdUtils.fastSimpleUUID()); // 生成一个唯一ID并设置到wmsSellOutEmbryo2的ID字段
wmsSellOutEmbryoMapper.insertWmsSellOutEmbryoOrder(wmsSellOutEmbryo2); // 将wmsSellOutEmbryo2插入到数据库
}
}
}
}
//
//
//
// //TH ods_procure_order_card
//
//
// for (WmsSellOutEmbryo wmsSellOutEmbryo:
// wmsSellOutEmbryoList) {
// WmsSellOutEmbryo wmsSellOutEmbryo1= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoById(wmsSellOutEmbryo.getId());
// String productCode =wmsSellOutEmbryo1.getProductCode();
// BigDecimal planQuantity = wmsSellOutEmbryo1.getPlanQuantity();
// List<WmsFpStorageNewsSn> wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectwmsFpStorageNewsGroupWaCode(productCode);
// if (wmsFpStorageNewsSns.size()<1){
// return productCode+"无库存";
// }
// String stock= wmsSellOutEmbryoMapper.selectwmsFpStorageNewsTS(formattedDate);
//
// }
if (ten>0){
return result+"没有对应订单库存";
}else {
result="完成";
}
return result;
}

12
op-modules/op-wms/src/main/resources/mapper/wms/WmsFpStorageNewsSnMapper.xml
Unescape Escape View File

@ -379,6 +379,11 @@
WHERE storage_id = #{storageId}
AND active_flag = '1';
</update>
<update id="updateWmsFpStorageNewsSnsetZT" >
UPDATE wms_fp_storage_news_sn SET user_defined1 = CASE WHEN amount > out_amount THEN 1 WHEN amount = out_amount THEN 2 ELSE user_defined1 -- 保持原值，如果不满足条件
END WHERE storage_id = #{ storageId }
AND active_flag = '1';
</update>
<select id="selectwmsFpStorageNews" resultType="java.lang.String">
select DISTINCT user_defined1 from wms_fp_storage_news where product_code=#{productCode} and active_flag='1'
</select>
@ -511,10 +516,11 @@
product_code,
sn,
bar_code,
COALESCE(amount, 0) amount,
COALESCE(amount, 0) -COALESCE(out_amount, 0) amount, -- 实际数量
batch_number,
COALESCE(user_defined1, 0) AS user_defined1, -- 如果为空则返回0
COALESCE(user_defined2, 0) AS user_defined2, -- 如果为空则返回0
COALESCE(out_amount, 0) AS outAmount, -- 如果为空则返回0
user_defined3,
user_defined4,
user_defined5,
@ -577,7 +583,9 @@
WHERE
product_code like concat('%',#{productCode} ,
'%')
AND wh_code='0021'
AND wh_code='0021' and <![CDATA[
(wms_fp_storage_news_sn.amount-wms_fp_storage_news_sn.out_amount) > 0
]]>
GROUP BY
wa_code,
wh_code,

11
op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml
Unescape Escape View File

@ -1076,4 +1076,15 @@
</select>
<update id="updateWmsSellOutEmbryoAddOut" >
UPDATE wms_sell_out_embryo
SET out_quantity = COALESCE(out_quantity, 0) + #{planQuantity}
WHERE id = #{wmsSellOutEmbryo.id}
AND active_flag = '1';
</update>
<select id="selectWmsSellOutEmbryoListZT" parameterType="WmsSellOutEmbryo" resultMap="WmsSellOutEmbryoResult">
<include refid="selectWmsSellOutEmbryoVo"/>
<![CDATA[ where delivery_order = #{deliveryOrder} and plan_quantity > out_quantity ]]>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save