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

包材出库过账修改

Browse Source
master
mengjiao 7 months ago
parent 3460f4ec24
commit c6cc87fb8a
5 changed files with 299 additions and 103 deletions
Show Stats Download Patch File Download Diff File

63
op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java
Unescape Escape View File

@ -4,6 +4,8 @@ import java.util.List;
import com.op.system.api.domain.sap.SapMaterialPosting;
import com.op.wms.domain.OdsProcureOutOrder;
import com.op.wms.domain.WmsOdsEmStorageNews;
import com.op.wms.domain.WmsOdsMateStorageNews;
import org.apache.ibatis.annotations.Param;
/**
@ -59,59 +61,68 @@ public interface OdsProcureOutOrderMapper {
* @param IDs 需要删除的数据主键集合
* @return 结果
*/
public int deleteOdsProcureOutOrderByIDs(String[] IDs);
public int deleteOdsProcureOutOrderByIDs(String[] IDs);
OdsProcureOutOrder selectmesPrepare(OdsProcureOutOrder odsProcureOrder);
public OdsProcureOutOrder selectmesPrepare(OdsProcureOutOrder odsProcureOrder);
List<OdsProcureOutOrder> selectmesPrepareDetail(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectmesPrepareDetail(OdsProcureOutOrder odsProcureOutOrder);
void insertWmsRawMissionOut(OdsProcureOutOrder order);
public void insertWmsRawMissionOut(OdsProcureOutOrder order);
void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder);
public void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListByIds(@Param("list") List<OdsProcureOutOrder> orderList);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListByIds(@Param("list") List<OdsProcureOutOrder> orderList);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListByu1(@Param("list") List<OdsProcureOutOrder> orderList);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListByu1(@Param("list") List<OdsProcureOutOrder> orderList);
void updateOdsProcureOutOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List<OdsProcureOutOrder> sapMaterialPostingList);
public void updateOdsProcureOutOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List<OdsProcureOutOrder> sapMaterialPostingList);
List<String> selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order);
public List<String> selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order);
List<String> selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order);
public List<String> selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order);
String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder);
public String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> selectmesPrepareDetailWhite(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectmesPrepareDetailWhite(OdsProcureOutOrder odsProcureOutOrder);
OdsProcureOutOrder selectmesPreparelike(OdsProcureOutOrder odsProcureOrder);
public OdsProcureOutOrder selectmesPreparelike(OdsProcureOutOrder odsProcureOrder);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUfc(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUfc(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> PurchaseOrderOutboundPdafc(OdsProcureOutOrder odsProcureOrder);
public List<OdsProcureOutOrder> PurchaseOrderOutboundPdafc(OdsProcureOutOrder odsProcureOrder);
public int insertOdsProcureOutOrderfc(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListByu1fc(List<OdsProcureOutOrder> orderList);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListByu1fc(List<OdsProcureOutOrder> orderList);
void updateOdsProcureOutOrderByidsfc(@Param("order") OdsProcureOutOrder order, @Param("list") List<OdsProcureOutOrder> sapMaterialPostingList);
public void updateOdsProcureOutOrderByidsfc(@Param("order") OdsProcureOutOrder order, @Param("list") List<OdsProcureOutOrder> sapMaterialPostingList);
OdsProcureOutOrder selectOdsProcureOutOrderListZUfcsy(OdsProcureOutOrder odsProcureOutOrder);
public OdsProcureOutOrder selectOdsProcureOutOrderListZUfcsy(OdsProcureOutOrder odsProcureOutOrder);
OdsProcureOutOrder selectMesPrepareBC(OdsProcureOutOrder odsProcureOutOrder);
public OdsProcureOutOrder selectMesPrepareBC(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> selectMesPrepareDetailBC(OdsProcureOutOrder order);
public List<OdsProcureOutOrder> selectMesPrepareDetailBC(OdsProcureOutOrder order);
List<OdsProcureOutOrder> selectWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder);
public void insertWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder1);
OdsProcureOutOrder selectWmsOdsProcureOutOrderByID(String id);
public OdsProcureOutOrder selectWmsOdsProcureOutOrderByID(String id);
void updateWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder1);
public void updateWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder1);
List<OdsProcureOutOrder> selectOdsProcureOutOrderListZC(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZC(OdsProcureOutOrder odsProcureOutOrder);
public List<OdsProcureOutOrder> selectWmsOdsProcureOutOrderByIDs(@Param("list") List<OdsProcureOutOrder> orderList);
void updateWMSOdsProcureOutOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List<OdsProcureOutOrder> sapMaterialPostingList);
List<WmsOdsMateStorageNews> selectWmsRawMissionOutByPrdAndMa(OdsProcureOutOrder order1);
List<OdsProcureOutOrder> selectPreDetailHzList(OdsProcureOutOrder odsProcureOutOrder);
}

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

@ -76,4 +76,6 @@ public interface WmsOdsMateStorageNewsSnMapper {
public void updateWmsOdsMateStorageNewsSnAddoutNumber(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn);
public WmsOdsMateStorageNewsSn selectWmsOdsMateStorageNewsSnByWlCodeTEM(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn);
void updatesub(WmsOdsMateStorageNews wmsOdsMateStorageNews);
}

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

@ -1457,58 +1457,116 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
@Override
public List<OdsProcureOutOrder> ProductionMaterialRequisitionSC(OdsProcureOutOrder odsProcureOutOrder) {
//二维码获取的信息查询对应的sap生产订单，再用生产订单查询子单
DynamicDataSourceContextHolder.push("ds_" + odsProcureOutOrder.getFactoryCode());
List<OdsProcureOutOrder> orderLists=new ArrayList<>();
List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder);
if (orderListone.size()>0){
for (OdsProcureOutOrder order:orderListone){
if (!"3".equals(order.getOrderStatus())){
orderLists.add(order);
if (odsProcureOutOrder.getUserDefined4().length()<=10){
//二维码获取的信息查询对应的sap生产订单，再用生产订单查询子单
List<OdsProcureOutOrder> orderLists=new ArrayList<>();
List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder);
if (orderListone.size()>0){
for (OdsProcureOutOrder order:orderListone){
if (!"3".equals(order.getOrderStatus())){
orderLists.add(order);
}
}
return orderLists;
}
return orderLists;
}
OdsProcureOutOrder order = odsProcureOutOrderMapper.selectMesPrepareBC(odsProcureOutOrder);
List<OdsProcureOutOrder> orderList= odsProcureOutOrderMapper.selectMesPrepareDetailBC(order);
// OdsProcureOutOrder order = odsProcureOutOrderMapper.selectMesPrepareBC(odsProcureOutOrder);
List<OdsProcureOutOrder> orderList= odsProcureOutOrderMapper.selectPreDetailHzList(odsProcureOutOrder);
//根据订单号查询对应的最大批次号
Integer orderItem = 0;
for (OdsProcureOutOrder orderLine1 :
orderList) {
orderItem++;
orderLine1.setUserDefined2(String.format("%05d", orderItem));
}
List<OdsProcureOutOrder> orderList1=new ArrayList<>();
for (OdsProcureOutOrder order1:
orderList) {
OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
odsProcureOutOrder1.setSiteCode(order1.getFactoryCode());
odsProcureOutOrder1.setProduceCode(odsProcureOutOrder.getUserDefined4());//反冲
odsProcureOutOrder1.setOutNumber(new BigDecimal("0"));
//odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode());
odsProcureOutOrder1.setMaterialDesc(order1.getMaterialDesc());
odsProcureOutOrder1.setPlanDate(new Date());
odsProcureOutOrder1.setUnit(order1.getUnit());
odsProcureOutOrder1.setUserDefined5(odsProcureOutOrder.getUserDefined4());
//odsProcureOutOrder1.setProductionLineCode(order1.getStationNo());
//odsProcureOutOrder1.setUserDefined1(orderLine1.getBatchNo());
odsProcureOutOrder1.setActive("1");
odsProcureOutOrder1.setOrderStatus("1");//
odsProcureOutOrder1.setPlanNumber(order1.getPlanNumber());
odsProcureOutOrder1.setUserDefined2(order1.getUserDefined2());
odsProcureOutOrder1.setUserDefined3(order1.getUserDefined3());
odsProcureOutOrder1.setUserDefined4(odsProcureOutOrder.getUserDefined4());
odsProcureOutOrder1.setUserDefined10("1");
odsProcureOutOrder1.setCreateBy(odsProcureOutOrder.getCreateBy());
odsProcureOutOrder1.setCreateDate(new Date());
//odsProcureOutOrder1.setCreateDate(new Date());
//odsProcureOutOrder.set
odsProcureOutOrderMapper.insertWmsOdsProcureOutOrder(odsProcureOutOrder1);
orderList1.add(odsProcureOutOrder1);
}
return orderList1;
}else {
//二维码获取的信息查询对应的sap生产订单，再用生产订单查询子单
List<OdsProcureOutOrder> orderLists=new ArrayList<>();
List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder);
if (orderListone.size()>0){
for (OdsProcureOutOrder order:orderListone){
if (!"3".equals(order.getOrderStatus())){
orderLists.add(order);
}
}
return orderLists;
}
OdsProcureOutOrder order = odsProcureOutOrderMapper.selectMesPrepareBC(odsProcureOutOrder);
List<OdsProcureOutOrder> orderList= odsProcureOutOrderMapper.selectMesPrepareDetailBC(order);
//根据订单号查询对应的最大批次号
Integer orderItem = 0;
for (OdsProcureOutOrder orderLine1 :
orderList) {
orderItem++;
orderLine1.setUserDefined2(String.format("%05d", orderItem));
}
List<OdsProcureOutOrder> orderList1=new ArrayList<>();
for (OdsProcureOutOrder order1:
orderList) {
OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
odsProcureOutOrder1.setSiteCode(order1.getFactoryCode());
odsProcureOutOrder1.setProduceCode(order.getProduceCode());
odsProcureOutOrder1.setOutNumber(new BigDecimal("0"));
//odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode());
odsProcureOutOrder1.setMaterialDesc(order1.getMaterialDesc());
odsProcureOutOrder1.setPlanDate(new Date());
odsProcureOutOrder1.setUnit(order1.getUnit());
//odsProcureOutOrder1.setProductionLineCode(order1.getStationNo());
//odsProcureOutOrder1.setUserDefined1(orderLine1.getBatchNo());
odsProcureOutOrder1.setActive("1");
odsProcureOutOrder1.setOrderStatus("1");//
odsProcureOutOrder1.setPlanNumber(order1.getPlanNumber());
odsProcureOutOrder1.setUserDefined2(order1.getUserDefined2());
odsProcureOutOrder1.setUserDefined3(order1.getUserDefined3());
odsProcureOutOrder1.setUserDefined4(odsProcureOutOrder.getUserDefined4());
odsProcureOutOrder1.setUserDefined10("1");
odsProcureOutOrder1.setCreateBy(odsProcureOutOrder.getCreateBy());
odsProcureOutOrder1.setCreateDate(new Date());
odsProcureOutOrder1.setCreateDate(new Date());
//odsProcureOutOrder.set
odsProcureOutOrderMapper.insertWmsOdsProcureOutOrder(odsProcureOutOrder1);
orderList1.add(odsProcureOutOrder1);
//根据订单号查询对应的最大批次号
Integer orderItem = 0;
for (OdsProcureOutOrder orderLine1 :
orderList) {
orderItem++;
orderLine1.setUserDefined2(String.format("%05d", orderItem));
}
List<OdsProcureOutOrder> orderList1=new ArrayList<>();
for (OdsProcureOutOrder order1:
orderList) {
OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
odsProcureOutOrder1.setSiteCode(order1.getFactoryCode());
odsProcureOutOrder1.setProduceCode(order.getProduceCode());
odsProcureOutOrder1.setOutNumber(new BigDecimal("0"));
//odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode());
odsProcureOutOrder1.setMaterialDesc(order1.getMaterialDesc());
odsProcureOutOrder1.setPlanDate(new Date());
odsProcureOutOrder1.setUnit(order1.getUnit());
//odsProcureOutOrder1.setProductionLineCode(order1.getStationNo());
//odsProcureOutOrder1.setUserDefined1(orderLine1.getBatchNo());
odsProcureOutOrder1.setActive("1");
odsProcureOutOrder1.setOrderStatus("1");//
odsProcureOutOrder1.setPlanNumber(order1.getPlanNumber());
odsProcureOutOrder1.setUserDefined2(order1.getUserDefined2());
odsProcureOutOrder1.setUserDefined3(order1.getUserDefined3());
odsProcureOutOrder1.setUserDefined4(odsProcureOutOrder.getUserDefined4());
odsProcureOutOrder1.setUserDefined10("1");
odsProcureOutOrder1.setUserDefined5(order1.getNeedDate());
odsProcureOutOrder1.setCreateBy(odsProcureOutOrder.getCreateBy());
odsProcureOutOrder1.setCreateDate(new Date());
//odsProcureOutOrder1.setCreateDate(new Date());
//odsProcureOutOrder.set
odsProcureOutOrderMapper.insertWmsOdsProcureOutOrder(odsProcureOutOrder1);
orderList1.add(odsProcureOutOrder1);
}
return orderList1;
}
return orderList1;
}
@Override
@ -1569,6 +1627,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
order.setActive("1");
order.setCreateBy(createBy);
order.setCreateDate(new Date());
order.setSiteCode(factoryCode);
odsProcureOutOrderMapper.insertWmsRawMissionOut(order);
OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder();
odsProcureOutOrder1.setProduceCode(produceCode);
@ -1614,18 +1673,25 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
//先根据出库单获取
// * 退料的移动类型为 262
// * 领料的移动类型为 261
// List<OdsProcureOutOrder> orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList);
List<OdsProcureOutOrder> orderList1 = odsProcureOutOrderMapper.selectOdsProcureOutOrderListByu1(orderList);
//查询这个地方先暂时去掉Order_Status = '3' 条件
//List<SapMaterialPosting> sapMaterialPostingList=new ArrayList<>();
List<OdsProcureOutOrder> orderList2 = new ArrayList<>();
List<Map<String, Object>> mapList = new ArrayList<>();
List<OdsProcureOutOrder> orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByIDs(orderList);
List<OdsProcureOutOrder> orderList2 = new ArrayList<>();//非反冲
List<Map<String, Object>> mapList = new ArrayList<>();//非反冲
List<SapBackflushMPQuery> sapMaterialPostingFCList = new ArrayList<>();//反冲
List<OdsProcureOutOrder> orderList2FC = new ArrayList<>();//反冲
for (OdsProcureOutOrder odsProcureOutOrder :
orderList1) {
//取ｓａｐ仓库号
if ("X".equals(odsProcureOutOrder.getUserDefined3())) {
if (!"X".equals(odsProcureOutOrder.getUserDefined3())){
Map<String, Object> map = new HashMap<>();
map.put("AUFNR", odsProcureOutOrder.getProduceCode());
map.put("PLANT", odsProcureOutOrder.getSiteCode());
String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode());
map.put("LGORT", lgort);
map.put("MATNR", odsProcureOutOrder.getMaterialCode());
map.put("QUANTITY", odsProcureOutOrder.getOutNumber().toString());
map.put("MEINS", odsProcureOutOrder.getUnit());
mapList.add(map);
orderList2.add(odsProcureOutOrder);
}else {
SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery();
sapBackflushMPQuery.setPlant(odsProcureOutOrder.getSiteCode()); //工厂
String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode());
@ -1636,20 +1702,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
sapBackflushMPQuery.setBatch(odsProcureOutOrder.getUserDefined2()); //批号
sapMaterialPostingFCList.add(sapBackflushMPQuery);
orderList2FC.add(odsProcureOutOrder);
} else {
Map<String, Object> map = new HashMap<>();
map.put("AUFNR", odsProcureOutOrder.getProduceCode());
map.put("PLANT", odsProcureOutOrder.getSiteCode());
String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode());
map.put("LGORT", lgort);
map.put("MATNR", odsProcureOutOrder.getMaterialCode());
map.put("QUANTITY", odsProcureOutOrder.getOutNumber().toString());
map.put("MEINS", odsProcureOutOrder.getUnit());
mapList.add(map);
orderList2.add(odsProcureOutOrder);
}
}
}
if (mapList.size() > 0) {//非反冲过账
if (mapList.size() > 0) {
//非反冲过账
SapMaterialPosting sapMaterialPosting = new SapMaterialPosting();
sapMaterialPosting.setPostingType("261");
sapMaterialPosting.setMapList(mapList);
@ -1666,15 +1722,25 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
String userDefined9 = (String) map.get("MATERIALDOCUMENT");
order.setUserDefined9(userDefined9);
order.setUserDefined10("2");//成功
odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2);
} else {//
odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2);
for (OdsProcureOutOrder order1:
orderList2) {
//过账成功--减库存
List<WmsOdsMateStorageNews> odsEmStorageNews= odsProcureOutOrderMapper.selectWmsRawMissionOutByPrdAndMa(order1);
for (WmsOdsMateStorageNews wmsOdsMateStorageNews:
odsEmStorageNews) {
//wmsOdsMateStorageNews
wmsOdsMateStorageNews.setLastModifiedBy(SecurityUtils.getUsername());
wmsOdsMateStorageNewsSnMapper.updatesub(wmsOdsMateStorageNews);//库存调整
}
}
} else {
//
order.setUserDefined9("");
order.setUserDefined10("3");//失败
odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2);
odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2);
}
}
if (sapMaterialPostingFCList.size() > 0) {
//反冲过账
R result2 = remoteSapService.sapBackflushMP(sapMaterialPostingFCList);//x
@ -1689,11 +1755,22 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
String userDefined9 = (String) map.get("MATERIALDOCUMENT");
order.setUserDefined9(userDefined9);
order.setUserDefined10("2");//成功
odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2FC);
odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC);
for (OdsProcureOutOrder order1:
orderList2FC) {
//过账成功--减库存
List<WmsOdsMateStorageNews> odsEmStorageNews= odsProcureOutOrderMapper.selectWmsRawMissionOutByPrdAndMa(order1);
for (WmsOdsMateStorageNews wmsOdsMateStorageNews:
odsEmStorageNews) {
//wmsOdsMateStorageNews
wmsOdsMateStorageNews.setLastModifiedBy(SecurityUtils.getUsername());
wmsOdsMateStorageNewsSnMapper.updatesub(wmsOdsMateStorageNews);//库存调整
}
}
} else {//
order.setUserDefined9("");
order.setUserDefined10("3");//失败
odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2FC);
odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC);
}
}
}

99
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
Unescape Escape View File

@ -440,6 +440,17 @@
#{item.ID}
</foreach>
</update>
<update id="updateWMSOdsProcureOutOrderByids">
update wms_ods_procure_out_order
set User_Defined10 = #{order.userDefined10},
User_Defined9 = #{order.userDefined9},
User_Defined11 = #{order.userDefined11}
where ID in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.ID}
</foreach>
</update>
<update id="updateOdsProcureOutOrderByidsfc">
update ods_procure_out_order_fc
set User_Defined10 = #{order.userDefined10},
@ -755,6 +766,52 @@
wms_ods_procure_out_order
where ID = #{ID}
</select>
<select id="selectWmsOdsProcureOutOrderByIDs" resultMap="OdsProcureOutOrderResult">
SELECT DISTINCT
wms_ods_procure_out_order.Site_code,
wms_ods_procure_out_order.ID,
wms_ods_procure_out_order.Produce_Code,
wms_ods_procure_out_order.Material_Code,
wms_ods_procure_out_order.Material_Desc,
wms_ods_procure_out_order.Plan_Date,
wms_ods_procure_out_order.Plan_Number,
wms_ods_procure_out_order.Unit,
COALESCE ( wms_ods_procure_out_order.Out_Number, 0 ) AS Out_Number,
wms_raw_mission_out.user_defined2 Loc_Code,
wms_ods_procure_out_order.Loc_Desc,
wms_ods_procure_out_order.Production_Line_Desc,
wms_ods_procure_out_order.Production_Line_Code,
wms_ods_procure_out_order.Order_Status,
wms_ods_procure_out_order.User_Defined1,
wms_ods_procure_out_order.User_Defined2,
wms_ods_procure_out_order.User_Defined3,
wms_ods_procure_out_order.User_Defined4,
wms_ods_procure_out_order.User_Defined5,
wms_ods_procure_out_order.User_Defined6,
wms_ods_procure_out_order.User_Defined7,
wms_ods_procure_out_order.User_Defined8,
wms_ods_procure_out_order.User_Defined9,
wms_ods_procure_out_order.User_Defined10,
wms_ods_procure_out_order.User_Defined11,
wms_ods_procure_out_order.Supplier_Code,
wms_ods_procure_out_order.Supplier_Name,
wms_ods_procure_out_order.Create_By,
wms_ods_procure_out_order.Create_Date,
wms_ods_procure_out_order.Last_Update_By,
wms_ods_procure_out_order.Last_Update_Date,
wms_ods_procure_out_order.Active,
wms_ods_procure_out_order.Enterprise_Id,
wms_ods_procure_out_order.Enterprise_Code
FROM
wms_ods_procure_out_order
LEFT JOIN wms_raw_mission_out ON wms_raw_mission_out.prd_order = wms_ods_procure_out_order.Produce_Code
AND wms_raw_mission_out.material_code = wms_ods_procure_out_order.Material_Code
where wms_ods_procure_out_order.ID
<foreach item="odsProcureOutOrder" collection="list" open="(" separator="," close=")">
#{odsProcureOutOrder.ID}
</foreach>
and wms_ods_procure_out_order.Order_Status='3'
</select>
<select id="selectWmsOdsProcureOutOrder" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
SELECT
Site_code,
@ -794,7 +851,6 @@
FROM
wms_ods_procure_out_order
<where>
User_Defined3 =''
<if test="siteCode != null and siteCode != ''"> and Site_code = #{siteCode}</if>
<if test="produceCode != null and produceCode != ''"> and Produce_Code = #{produceCode}</if>
<if test="materialCode != null and materialCode != ''"> and Material_Code = #{materialCode}</if>
@ -989,4 +1045,45 @@
<if test="Active != null and Active != ''"> and Active = #{Active}</if>
</where>
</select>
<select id="selectWmsRawMissionOutByPrdAndMa" resultType="com.op.wms.domain.WmsOdsMateStorageNews">
SELECT
material_code materialCode,
origin_location waCode,
amount amount,
user_defined1 userDefined1,
user_defined2 userDefined2,
user_defined3 userDefined3
FROM
wms_raw_mission_out
WHERE
prd_order=#{produceCode} AND
material_code=#{Material_Code}
</select>
<select id="selectPreDetailHzList" resultMap="OdsProcureOutOrderResult">
SELECT
mpd.material_code Material_Code,
mpd.material_name Material_Desc,
SUM ( mpd.quantity ) Plan_Number,
mpd.unit Unit,
-- SUM ( CONVERT ( DECIMAL ( 10, 3 ), mpd.fund_quanlity ) ) fundQuanlity,
mpd.factory_code Site_code,
mpd.recoil User_Defined3
FROM
pro_order_workorder ow
LEFT JOIN mes_prepare mp ON ow.workorder_code = mp.workorder_code
LEFT JOIN mes_prepare_detail mpd ON mp.prepare_id = mpd.prepare_id
WHERE
ow.product_date = #{ productDateStr }
AND mpd.recoil = #{ recoil }
AND mp.del_flag = '0'
AND mpd.del_flag = '0'
GROUP BY
mpd.material_code,
mpd.material_name,
mpd.unit,
mpd.factory_code,
mpd.recoil
ORDER BY
mpd.material_code
</select>
</mapper>

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

@ -205,11 +205,20 @@
</update>
<update id="updatekdd">
update wms_ods_mate_storage_news
set occupy_amount = occupy_amount + #{amount},
set occupy_amount =ISNULL(occupy_amount, 0) + #{amount},
last_modified_by=#{lastModifiedBy},
gmt_modified=GETDATE()
where wh_code=#{whCode} and wa_code=#{waCode} and wl_code=#{wlCode} and material_code=#{materialCode}
</update>
<update id="updatesub">
update wms_ods_mate_storage_news
set occupy_amount =ISNULL(occupy_amount, 0) - #{amount},
amount = ISNULL(amount, 0) - #{amount},
last_modified_by=#{lastModifiedBy},
gmt_modified=GETDATE()
where wh_code=#{userDefined2} and wa_code=#{waCode} and wl_code=#{userDefined3} and material_code=#{materialCode}
</update>
<select id="selectByWhCodeAndMate">
<include refid="selectWmsOdsMateStorageNewsSnVo"/>
where mate_order_in_sn_id = #{mateOrderInSnId}

Write Preview
Loading…
Cancel
Save