10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

feat 到货单明细

Browse Source
This commit is contained in:
Amjacks 2025-03-31 14:31:16 +08:00
parent e9514e252d
commit 27d7b880a9
9 changed files with 155 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java
View File

@ -70,4 +70,14 @@ public class DeliveryController {
// 获取采购单明细及批次
return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getStoreDetail(siteName, nameList));
}
/**
* 获取采购订单详情
*/
@PostMapping(value = "/getReceiveDetail")
public AjaxResult getReceiveDetail(@RequestBody JSONObject in) {
List<String> nameList = (List<String>) in.get("nameList");
// 获取采购订单详情
return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getReceiveDetail(nameList));
}
}

13
zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
View File

@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;
import com.cim.idm.service.Impl.SDKMaterialPackingServiceImpl;
@ -175,7 +176,19 @@ public class MaterialReceiveActController {
String receiveActNo = box.getReceiveActNo();
String receiveQty = box.getRECEIVEDQUANTITY2();//实收数量
String receiveRequestDetailName = box.getReceiveRequestDetailName();
// 单据
String receiveRequestName = box.getReceiveRequestName();
// 判断是否是倒库单据
MaterialReceiveRequest byKey = deliveryService.getByKey(boxs.getSiteName(), boxs.getReceiveRequestName());
if (byKey.getReceiveRequestType().equals(ReceiveTypeEnums.DK.getCode())) {
// 检索该到库订单下该物料的采购订单的 name
List<MaterialReceiveRequest> collect = deliveryService.getReceiveByDelivery(boxs.getSiteName(), boxs.getReceiveRequestName())
.stream().filter(item -> item.getMaterialSpecName().equals(materialSpecName)).collect(Collectors.toList());
// 检查剩余数量
// if () {
//
// }
}
String remark = box.getRemark();
String sdkid = box.getSdkid() == null ? "" : box.getSdkid();
String shipRequestDetailName = box.getShipRequestDetailName();

14
zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java
View File

@ -1,6 +1,8 @@
package com.cim.idm.dao;
import com.cim.idm.model.DeliveryRelationDto;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.MaterialReceiveRequestDetail;
import com.cim.idm.model.PurchaseDto;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
@ -21,6 +23,11 @@ public interface DeliveryDao {
@Param("receiveRequestName") String receiveRequestName,
@Param("receiveRequestType") String receiveRequestType );
/**
* 新增到货单关系
*/
int createRelation(@Param("receiveList") List<DeliveryRelationDto> receiveList);
/**
* 绑定采购订单 的 到货单
*/
@ -59,4 +66,11 @@ public interface DeliveryDao {
*/
List<MaterialReceiveRequest> getReceiveByDelivery(@Param("siteName") String siteName,
@Param("receiveRequestName") String receiveRequestName);
/**
* 根据到库单获取采购单名称
* @param nameList 到库单
* @return 采购单名称列表
*/
List<MaterialReceiveRequestDetail> getReceiveDetail(@Param("nameList") List<String> nameList);
}

3
zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java
View File

@ -15,4 +15,7 @@ public class DeliveryDto {
// 数据
private List<MaterialReceiveRequestKey> dataList;
// 数据
private List<DeliveryRelationDto> receiveList;
}

13
zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java Normal file
View File

@ -0,0 +1,13 @@
package com.cim.idm.model;
import lombok.Data;
@Data
public class DeliveryRelationDto {
// 到库单名称
private String deliveryName;
// 到库数量
private Integer deliveryNum = 0;
// 采购单名称
private String receiveRequestName;
}

56
zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java Normal file
View File

@ -0,0 +1,56 @@
package com.cim.idm.model;
import lombok.Data;
import java.sql.Timestamp;
@Data
public class MaterialReceiveRequestDetail {
private String siteName;
private String receiveRequestName;
private String receiveRequestDetailName;
private String pocategory; // 对应SAP PSTYPE
private String receiveRequestDetailType; //对应SAP KNTTP
private String materialSpecName;
private String description;
private double requestQuantity;
private double receivedQuantity;
private String erpLocation;
private String locationName;
private String erpFactory;
private String returnFlag;
private String freeFlag;
private String forceCompletedFlag;
private String receiveRequestDetailState;
private String holdState;
private String iqcFlag;
private Timestamp planDate;
private String createUser;
private Timestamp createTime;
private String lastEventName;
private String lastEventTimeKey;
private Timestamp lastEventTime;
private String lastEventUser;
private String lastEventComment;
private String innerOrder;//内部订单号20190806
private String charge;
private String applicant;
private String erpPoName;
private String erpPoDetailName;
private String innerFlag;
//众凌定制字段
private String supplierCharge;
private String materialUnit;
private String finishFlag;
private String costCenter;//成本中心
private Timestamp orderChangeDate; //订单更改日期
private String wmsReturnChargeNo; //WMS退货批次号
private String purchaseRequestNote; //采购申请备注信息
private String purchaseRequestNo; //采购申请单号
private String purchaseRequestDetailNo; //采购申请单行号
private String deleteDetailFlag; //订单行项目删除标识
private String salesman; // 业务员zzywy
private String salesAssistant; // 业务助理zzywzl
private String businessDivision; // 事业部zzsyb
}

8
zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java
View File

@ -3,6 +3,7 @@ package com.cim.idm.service;
import com.cim.idm.model.DeliveryDto;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.PageDto;
import com.cim.idm.model.MaterialReceiveRequestDetail;
import com.github.pagehelper.PageInfo;
import java.util.List;
@ -45,4 +46,11 @@ public interface IDeliveryService {
* @return 采购单名称列表
*/
List<MaterialReceiveRequest> getReceiveByDelivery(String siteName, String receiveRequestName);
/**
* 根据到库单获取采购单名称
* @param nameList 到库单
* @return 采购单名称列表
*/
List<MaterialReceiveRequestDetail> getReceiveDetail(List<String> nameList);
}

17
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java
View File

@ -3,10 +3,7 @@ package com.cim.idm.service.Impl;
import com.alibaba.fastjson.JSON;
import com.cim.idm.constants.ReceiveTypeEnums;
import com.cim.idm.dao.DeliveryDao;
import com.cim.idm.model.DeliveryDto;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.PageDto;
import com.cim.idm.model.PurchaseDto;
import com.cim.idm.model.*;
import com.cim.idm.service.IDeliveryService;
import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
import com.github.pagehelper.PageInfo;
@ -34,6 +31,13 @@ public class DeliveryServiceImpl implements IDeliveryService {
dto.getReceiveRequestName(), ReceiveTypeEnums.DK.getCode()) <= 0) {
return "添加到库单失败";
}
// 添加到库单关系
for (DeliveryRelationDto item : dto.getReceiveList()) {
item.setDeliveryName(dto.getReceiveRequestName());
}
if (deliveryDao.createRelation(dto.getReceiveList()) <= 0) {
return "添加到库单关系失败";
}
// 更新采购单到库单字段
List<String> collect = dto.getDataList().stream()
.map(MaterialReceiveRequestKey::getReceiveRequestName).collect(Collectors.toList());
@ -69,4 +73,9 @@ public class DeliveryServiceImpl implements IDeliveryService {
public List<MaterialReceiveRequest> getReceiveByDelivery(String siteName, String receiveRequestName) {
return deliveryDao.getReceiveByDelivery(siteName, receiveRequestName);
}
@Override
public List<MaterialReceiveRequestDetail> getReceiveDetail(List<String> nameList) {
return deliveryDao.getReceiveDetail(nameList);
}
}

29
zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
View File

@ -7,6 +7,14 @@
VALUES (#{siteName}, #{receiveRequestName}, #{receiveRequestType})
</insert>
<insert id="createRelation">
INSERT ALL
<foreach item="item" index="index" collection="receiveList">
INTO MATERIALRECEIVEDELIVERY (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum})
</foreach>
SELECT * FROM dual
</insert>
<update id="bindDelivery">
UPDATE MATERIALRECEIVEREQUEST SET DELIVERYNAME = #{receiveRequestName}
WHERE SITENAME = #{siteName}
@ -95,10 +103,6 @@
</foreach>
AND m.SITENAME = #{siteName}
AND m2.RECEIVEREQUESTTYPE IN ( 'ZK4A', '45', '4C', 'Z001', 'Z002', 'Z003', 'Z004' )
GROUP BY m3.DESCRIPTION, be.DESCRIPTION, m.ERPLOCATION, o.ORGNAME, m2.STOCKORGNO, sss.DESCRIPTION,
m.LOCATIONNAME, m2.SUPPLIERNO, m3.DESC_CN, m.MATERIALUNIT, M3.MATERIALUNITDESC,
m3.EXPIRATION_RULES, m.SDK_ID, m3.WIDTH, m3.PHASE, m.MATERIALSPECNAME, m.SITENAME,
m.RECEIVEREQUESTNAME, m3.IS_BATCH, m4.IQCFLAG
</select>
<!-- GetPackingRow xh002 -->
@ -149,4 +153,21 @@
WHERE SITENAME = #{siteName}
AND DELIVERYNAME = #{receiveRequestName}
</select>
<select id="getReceiveDetail" resultType="com.cim.idm.model.MaterialReceiveRequestDetail">
SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, POCATEGORY, RECEIVEREQUESTDETAILTYPE,
MATERIALSPECNAME, DESCRIPTION, REQUESTQUANTITY, RECEIVEDQUANTITY, ERPLOCATION, RETURNFLAG, FREEFLAG,
RECEIVEREQUESTDETAILSTATE, HOLDSTATE, IQCFLAG, PLANDATE, CREATEUSER, CREATETIME, CHARGE, ERPFACTORY,
LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER, LASTEVENTCOMMENT, SDK_ID, MATERIALUNIT,
STATE, PHASE, ERPDETAILID, SOURCELINEID, APPLICANT, INNERORDER, ERPPONAME, INNERFLAG, SUPPLIERCHARGE,
FORCECOMPLETEDFLAG, ERPPODETAILNAME, TRANFERTYPE, PRTBARCODEQTY, LOCATIONNAME, DELETEDETAILFLAG,
PRODUCTORDER, PLANORDER, REMARK, SALESMAN, SALESASSISTANT, BUSINESSDIVISION, FINISHFLAG, COSTCENTER,
ORDERCHANGEDATE, WMSRETURNCHARGENO, PURCHASEREQUESTNOTE, PURCHASEREQUESTNO, PURCHASEREQUESTDETAILNO
FROM MATERIALRECEIVEREQUESTDETAIL
WHERE RECEIVEREQUESTNAME in
<foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
#{name}
</foreach>
order by RECEIVEREQUESTNAME
</select>
</mapper>