Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wms包材退货接口3

Browse Source
master
mengjiao 9 months ago
parent a8648e0543
commit 66682323f9
8 changed files with 192 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java
Unescape Escape View File

@ -134,4 +134,10 @@ public class OdsProcureOutOrderController extends BaseController {
String result = odsProcureOutOrderService.addreturnderZC(orderList);
return success(result);
}
//查询订单要退的物料批次
@PostMapping("/listReturnBC")
public TableDataInfo listReturnBC( OdsProcureOutOrder odsProcureOutOrder) {
List<String> list = odsProcureOutOrderService.listReturnBC(odsProcureOutOrder);
return getDataTable(list);
}
}

9
op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
Unescape Escape View File

@ -34,7 +34,8 @@ public class WmsToWCSmissionController {
private IOdsProductEmbryoInventoryService odsProductEmbryoInventoryService;
@Autowired
private IBaseAreaService baseAreaService;
@Autowired
private IOdsProcureOutOrderService odsProcureOutOrderService;
/**
* 包材请求入库---
@ -833,5 +834,11 @@ public class WmsToWCSmissionController {
String result = odsProcureOrderService.addOrderCardX(orderList);
return success(result);
}
//退货
@PostMapping("/listReturnSC")
public AjaxResult listReturn(@RequestBody OdsProcureOutOrder odsProcureOutOrder) {
List<OdsProcureOutOrder> list = odsProcureOutOrderService.listReturnSC(odsProcureOutOrder);
return success(list);
}
}

19
op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java
Unescape Escape View File

@ -45,6 +45,15 @@ public class OdsProcureOutOrder extends BaseEntity {
*/
@Excel(name = "工厂编码")
private String siteCode;
private BigDecimal qty;
public BigDecimal getQty() {
return qty;
}
public void setQty(BigDecimal qty) {
this.qty = qty;
}
/**
* ID
@ -172,6 +181,16 @@ public class OdsProcureOutOrder extends BaseEntity {
*/
@Excel(name = "已出库数量")
private BigDecimal outNumber;
private BigDecimal returnNumber;
public BigDecimal getReturnNumber() {
return returnNumber;
}
public void setReturnNumber(BigDecimal returnNumber) {
this.returnNumber = returnNumber;
}
@Excel(name = "报工数量")
private BigDecimal BGNumber;

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

@ -123,6 +123,7 @@ public interface OdsProcureOutOrderMapper {
public List<WmsOdsMateStorageNews> selectWmsRawMissionOutByPrdAndMa(OdsProcureOutOrder order1);
public List<String> selectWmsRawMissionOutByPrdAndMaQC(OdsProcureOutOrder order1);
public List<OdsProcureOutOrder> selectPreDetailHzList(OdsProcureOutOrder odsProcureOutOrder);
@ -133,4 +134,8 @@ public interface OdsProcureOutOrderMapper {
List<OdsProcureOutOrder> selectMesReportWorkConsumeFC(@Param("userDefined4")String userDefined4,@Param("materialCode")String materialCode);
List<OdsProcureOutOrder> selectOdsProcureReturnOrderListZC(OdsProcureOutOrder odsProcureOutOrder);
void insertWmsOdsProcureReturnOrder(OdsProcureOutOrder odsProcureOutOrder1);
void updateOdsProcureOutOrderByPcAndMc(OdsProcureOutOrder order);
}

4
op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java
Unescape Escape View File

@ -70,4 +70,8 @@ public interface IOdsProcureOutOrderService {
List<OdsProcureOutOrder> selectOdsProcureReturnOrderListZC(OdsProcureOutOrder odsProcureOutOrder);
String addreturnderZC(List<OdsProcureOutOrder> orderList);
List<String> listReturnBC(OdsProcureOutOrder odsProcureOutOrder);
List<OdsProcureOutOrder> listReturnSC(OdsProcureOutOrder odsProcureOutOrder);
}

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

@ -1914,6 +1914,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
@Override
public String addOrderCardX(List<OdsProcureOrder> orderList) {
String factoryCode = orderList.get(0).getFactoryCode();
String receiptNoCode = orderList.get(0).getReceiptNoCode();
//现在是传了个list标识卡集合
String result1="操作成功";
DynamicDataSourceContextHolder.push("ds_" + factoryCode);
@ -1993,6 +1994,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
wmsRawOrderInSn.setFactoryCode(order1k.getFactoryCode());
wmsRawOrderInSn.setUserDefined3(order1k.getID());
wmsRawOrderInSn.setUserDefined5(order1k.getReceiptNoCode());
//wmsRawOrderInSn.setd
wmsRawOrderInSn.setUserDefined6(order1k.getUserDefined6());//标识码绑定
wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn);
//标识码绑定
@ -2032,7 +2034,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn();
wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID());
wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode());
wmsRawOrderIn.setDnNo(odsProcureOrder.getReceiptNoCode());
wmsRawOrderIn.setDnNo(receiptNoCode);
wmsRawOrderIn.setPoNo(odsProcureOrder.getProcureCode());
wmsRawOrderIn.setPoLine(odsProcureOrder.getUserDefined3());
wmsRawOrderIn.setMaterialCode(odsProcureOrder.getMaterialCode());
@ -2049,7 +2051,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
wmsRawOrderIn.setUserDefined2(MATDOCUMENTYEAR);//年凭证号
wmsRawOrderIn.setUserDefined3(result2.getMsg());//暂收信息
//wmsRawOrderIn.setAccountingMessage(result2.getMsg());
wmsRawOrderIn.setSapFactoryCode(odsProcureOrder.getFactoryCode());
wmsRawOrderIn.setSapFactoryCode(factoryCode);
wmsRawOrderIn.setCreateBy(odsProcureOrder.getCreateBy());
wmsRawOrderIn.setGmtCreate(new Date());
wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn);

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

@ -3,14 +3,22 @@ package com.op.wms.service.impl;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.op.wms.mapper.OdsProcureOutOrderMapper;
import com.op.wms.domain.OdsProcureOutOrder;
import com.op.wms.service.IOdsProcureOutOrderService;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* 包材出库单Service业务层处理
@ -168,20 +176,61 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
}
@Override
@DS("#header.poolName")
public String addreturnderZC(List<OdsProcureOutOrder> orderList) {
//生成退货单，并且在对应的订单上累加加上退货数量
String result="生成退货单成功";
//生成退货单
// 获取工厂编码
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
//TH ods_procure_order_card
Date date = new Date();
String formattedDate = dateFormat.format(date);
for(OdsProcureOutOrder order:orderList){
OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder();
odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID());
odsProcureOutOrder1.setSiteCode(factoryCode);
odsProcureOutOrder1.setProduceCode("TL"+formattedDate);
odsProcureOutOrder1.setReturnNumber(new BigDecimal("0"));
//odsProcureOutOrder1.setLocCode(order.getWarehouseNo());
odsProcureOutOrder1.setMaterialCode(order.getMaterialCode());
odsProcureOutOrder1.setMaterialDesc(order.getMaterialDesc());
odsProcureOutOrder1.setPlanDate(new Date());
odsProcureOutOrder1.setUnit(order.getUnit());
odsProcureOutOrder1.setActive("1");
odsProcureOutOrder1.setOrderStatus("1");//
odsProcureOutOrder1.setPlanNumber(order.getQty());
//odsProcureOutOrder1.setUserDefined2(order.getUserDefined2());
if(order.getProduceCode().length()<=11){
odsProcureOutOrder1.setUserDefined3("X");//反冲
}else {
odsProcureOutOrder1.setUserDefined3("");
}
odsProcureOutOrder1.setUserDefined4(order.getProduceCode());
odsProcureOutOrder1.setUserDefined10("1");
odsProcureOutOrder1.setCreateBy(SecurityUtils.getUsername());
odsProcureOutOrder1.setCreateDate(new Date());
odsProcureOutOrderMapper.insertWmsOdsProcureReturnOrder(odsProcureOutOrder1);
odsProcureOutOrderMapper.updateOdsProcureOutOrderByPcAndMc(order);
}
return result;
}
@Override
@DS("#header.poolName")
public List<String> listReturnBC(OdsProcureOutOrder odsProcureOutOrder) {
List<String> list= odsProcureOutOrderMapper.selectWmsRawMissionOutByPrdAndMaQC(odsProcureOutOrder);
return list;
}
return null;
@Override
public List<OdsProcureOutOrder> listReturnSC(OdsProcureOutOrder odsProcureOutOrder) {
DynamicDataSourceContextHolder.push("ds_" + odsProcureOutOrder.getFactoryCode());
List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(odsProcureOutOrder);
return orderList;
}
}

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

@ -42,6 +42,7 @@
<result property="enterpriseCode" column="Enterprise_Code"/>
<result property="workorderCode" column="workorderCode"/>
<result property="needDate" column="needDate"/>
<result property="returnNumber" column="Return_Number"/>
</resultMap>
<sql id="pagination_tail">
limit #{page.pageOffset} , #{page.rows}
@ -343,6 +344,11 @@
where ID = #{ID}
</update>
<update id="updateOdsProcureOutOrderByPcAndMc" parameterType="OdsProcureOutOrder">
update wms_ods_procure_return_order
set Return_Number = COALESCE(Return_Number, 0) + #{qty}
where Produce_Code = #{ID} and Material_Code=#{materialCode}
</update>
<delete id="deleteOdsProcureOutOrderByID" parameterType="String">
delete from ods_procure_out_order where ID = #{ID}
</delete>
@ -1063,6 +1069,16 @@
prd_order=#{produceCode} AND
material_code=#{materialCode}
</select>
<select id="selectWmsRawMissionOutByPrdAndMaQC" resultType="java.lang.String">
SELECT
DISTINCT
user_defined1 userDefined1
FROM
wms_raw_mission_out
WHERE
prd_order=#{produceCode} AND
material_code=#{materialCode}
</select>
<select id="selectPreDetailHzList" resultMap="OdsProcureOutOrderResult">
SELECT
mpd.material_code Material_Code,
@ -1164,7 +1180,7 @@
Plan_Date,
Plan_Number,
Unit,
COALESCE ( Out_Number, 0 ) AS Out_Number,
COALESCE ( Return_Number, 0 ) AS Return_Number,
Loc_Code,
Loc_Desc,
Production_Line_Desc,
@ -1229,4 +1245,80 @@
</where>
</select>
<select id="insertWmsOdsProcureReturnOrder" parameterType="OdsProcureOutOrder">
insert into wms_ods_procure_return_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="siteCode != null">Site_code,</if>
<if test="ID != null">ID,</if>
<if test="produceCode != null">Produce_Code,</if>
<if test="materialCode != null">Material_Code,</if>
<if test="materialDesc != null">Material_Desc,</if>
<if test="planDate != null">Plan_Date,</if>
<if test="planNumber != null">Plan_Number,</if>
<if test="Unit != null">Unit,</if>
<if test="returnNumber != null">Return_Number,</if>
<if test="locCode != null">Loc_Code,</if>
<if test="locDesc != null">Loc_Desc,</if>
<if test="productionLineDesc != null">Production_Line_Desc,</if>
<if test="productionLineCode != null">Production_Line_Code,</if>
<if test="orderStatus != null">Order_Status,</if>
<if test="userDefined1 != null">User_Defined1,</if>
<if test="userDefined2 != null">User_Defined2,</if>
<if test="userDefined3 != null">User_Defined3,</if>
<if test="userDefined4 != null">User_Defined4,</if>
<if test="userDefined5 != null">User_Defined5,</if>
<if test="userDefined6 != null">User_Defined6,</if>
<if test="userDefined7 != null">User_Defined7,</if>
<if test="userDefined8 != null">User_Defined8,</if>
<if test="userDefined9 != null">User_Defined9,</if>
<if test="userDefined10 != null">User_Defined10,</if>
<if test="userDefined11 != null">User_Defined11,</if>
<if test="supplierCode != null">Supplier_Code,</if>
<if test="supplierName != null">Supplier_Name,</if>
<if test="createBy != null">Create_By,</if>
<if test="createDate != null">Create_Date,</if>
<if test="lastUpdateBy != null">Last_Update_By,</if>
<if test="lastUpdateDate != null">Last_Update_Date,</if>
<if test="Active != null">Active,</if>
<if test="enterpriseId != null">Enterprise_Id,</if>
<if test="enterpriseCode != null">Enterprise_Code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="siteCode != null">#{siteCode},</if>
<if test="ID != null">#{ID},</if>
<if test="produceCode != null">#{produceCode},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialDesc != null">#{materialDesc},</if>
<if test="planDate != null">#{planDate},</if>
<if test="planNumber != null">#{planNumber},</if>
<if test="Unit != null">#{Unit},</if>
<if test="returnNumber != null">#{returnNumber},</if>
<if test="locCode != null">#{locCode},</if>
<if test="locDesc != null">#{locDesc},</if>
<if test="productionLineDesc != null">#{productionLineDesc},</if>
<if test="productionLineCode != null">#{productionLineCode},</if>
<if test="orderStatus != null">#{orderStatus},</if>
<if test="userDefined1 != null">#{userDefined1},</if>
<if test="userDefined2 != null">#{userDefined2},</if>
<if test="userDefined3 != null">#{userDefined3},</if>
<if test="userDefined4 != null">#{userDefined4},</if>
<if test="userDefined5 != null">#{userDefined5},</if>
<if test="userDefined6 != null">#{userDefined6},</if>
<if test="userDefined7 != null">#{userDefined7},</if>
<if test="userDefined8 != null">#{userDefined8},</if>
<if test="userDefined9 != null">#{userDefined9},</if>
<if test="userDefined10 != null">#{userDefined10},</if>
<if test="userDefined11 != null">#{userDefined11},</if>
<if test="supplierCode != null">#{supplierCode},</if>
<if test="supplierName != null">#{supplierName},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createDate != null">#{createDate},</if>
<if test="lastUpdateBy != null">#{lastUpdateBy},</if>
<if test="lastUpdateDate != null">#{lastUpdateDate},</if>
<if test="Active != null">#{Active},</if>
<if test="enterpriseId != null">#{enterpriseId},</if>
<if test="enterpriseCode != null">#{enterpriseCode},</if>
</trim>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save