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 15:02:54 +08:00
parent 27d7b880a9
commit 9a56250214
28 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java
View File

@ -2,7 +2,7 @@ package com.cim.idm.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking;
import org.springframework.beans.factory.annotation.Autowired;

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

@ -3,9 +3,9 @@ package com.cim.idm.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.constants.ReceiveTypeEnums;
import com.cim.idm.model.DeliveryDto;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.PageDto;
import com.cim.idm.model.dto.DeliveryDto;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.dto.PageDto;
import com.cim.idm.service.IDeliveryService;
import com.cim.idm.utils.AjaxResult;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

4
zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java
View File

@ -5,12 +5,11 @@ import com.alibaba.fastjson.JSONObject;
import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.model.MaterialPacking;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.response.BaseResponse;
import com.cim.idm.response.RespGenerator;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.CommonUtils;
import com.cim.idm.wmspackage.name.NameServiceProxy;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.web.bind.annotation.RequestBody;
@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

3
zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java
View File

@ -6,6 +6,7 @@ import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.model.*;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.service.QueryService;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.EventInfoUtil;
@ -23,14 +24,12 @@ import com.cim.idm.wmspackage.name.NameServiceProxy;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;

3
zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java
View File

@ -7,6 +7,9 @@ import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.model.*;
import com.cim.idm.model.dto.TrackOutBoDto;
import com.cim.idm.model.dto.StoragePrintDto;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl;
import com.cim.idm.response.BaseResponse;
import com.cim.idm.response.RespGenerator;

4
zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java
View File

@ -2,7 +2,7 @@ package com.cim.idm.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.model.*;
import com.cim.idm.model.dto.MaterialNotPostedDto;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey;
@ -23,7 +23,7 @@ public class MaterialPackingController {
*/
@PostMapping(value = "/update")
public AjaxResult update(@RequestBody JSONObject in) {
MaterialNotPostedRequest sl = JSON.toJavaObject(in, MaterialNotPostedRequest.class);
MaterialNotPostedDto sl = JSON.toJavaObject(in, MaterialNotPostedDto.class);
// 获取数据
List<MaterialPackingKey> collect = sl.getDataList().stream().map(item -> {
MaterialPackingKey packingKey = new MaterialPackingKey();

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

@ -5,9 +5,9 @@ import com.alibaba.fastjson.JSONObject;
import com.cim.idm.constants.ReceiveTypeEnums;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.MaterialreceiveActDto;
import com.cim.idm.model.TrackOutBoDto;
import com.cim.idm.model.dto.TrackOutBoDto;
import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl;
import com.cim.idm.service.IDeliveryService;
import com.cim.idm.service.impl.QMSServiceImpl;

3
zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java
View File

@ -10,11 +10,10 @@ import java.util.Map;
import java.util.Objects;
import com.cim.idm.exception.GlobalException;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.ShelfDto;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.CommonUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

2
zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java
View File

@ -7,7 +7,7 @@ import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.model.MaterialPacking;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.CommonUtils;
import com.cim.idm.utils.EventInfoUtil;

2
zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java
View File

@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.dao.PurchaseReturnServiceDao;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.PurchaseReturnDto;
import com.cim.idm.model.StockOutDto;
import com.cim.idm.service.PurchaseReturnService;

2
zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java
View File

@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.IDMFrameServiceProxy;
import com.cim.idm.model.MaterialPacking;
import com.cim.idm.model.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.MaterialshipRequest;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.utils.CommonUtils;

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

@ -1,9 +1,9 @@
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 com.cim.idm.model.dto.DeliveryRelationDto;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequestDetail;
import com.cim.idm.model.dto.PurchaseDto;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

2
zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java → zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.bo;
import lombok.Data;

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

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
import lombok.Data;

2
zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java → zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import lombok.Data;

5
zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java → zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java
View File

@ -1,11 +1,12 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import com.cim.idm.model.MaterialPacking;
import lombok.Data;
import java.util.List;
@Data
public class MaterialNotPostedRequest {
public class MaterialNotPostedDto {
// 批次
private String CHARGE;

2
zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java → zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import lombok.Data;
import com.alibaba.fastjson.JSONObject;

2
zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java → zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import lombok.Data;

2
zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java → zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import lombok.Data;
import lombok.NoArgsConstructor;

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

@ -1,5 +1,6 @@
package com.cim.idm.model;
package com.cim.idm.model.dto;
import com.cim.idm.model.MaterialreceiveActDto;
import lombok.Data;
@Data

2
zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java → zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.po;
import lombok.Data;

2
zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java → zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java
View File

@ -1,4 +1,4 @@
package com.cim.idm.model;
package com.cim.idm.model.po;
import lombok.Data;

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

@ -1,9 +1,9 @@
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.cim.idm.model.dto.DeliveryDto;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.dto.PageDto;
import com.cim.idm.model.po.MaterialReceiveRequestDetail;
import com.github.pagehelper.PageInfo;
import java.util.List;

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

@ -12,6 +12,8 @@ import com.cim.idm.framework.orm.info.KeyInfo;
import com.cim.idm.framework.orm.service.CommonServiceDAO;
import com.cim.idm.framework.util.time.TimeStampUtil;
import com.cim.idm.model.*;
import com.cim.idm.model.bo.StorageObject;
import com.cim.idm.model.dto.StoragePrintDto;
import com.cim.idm.mwmsextend.generic.util.CommonUtil;
import com.cim.idm.wmsextend.generic.errorHandler.CustomException;
import com.cim.idm.wmsextend.generic.util.ObjectUtil;

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

@ -3,7 +3,12 @@ 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.*;
import com.cim.idm.model.dto.PageDto;
import com.cim.idm.model.dto.PurchaseDto;
import com.cim.idm.model.dto.DeliveryDto;
import com.cim.idm.model.dto.DeliveryRelationDto;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.model.po.MaterialReceiveRequestDetail;
import com.cim.idm.service.IDeliveryService;
import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey;
import com.github.pagehelper.PageInfo;

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

@ -2,6 +2,7 @@ package com.cim.idm.service.Impl;
import com.cim.idm.framework.data.EventInfo;
import com.cim.idm.model.*;
import com.cim.idm.model.dto.StoragePrintDto;
import com.cim.idm.service.LabelService;
import com.cim.idm.utils.EventInfoUtil;
import com.cim.idm.wmsextend.generic.errorHandler.CustomException;

1
zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java
View File

@ -2,6 +2,7 @@ package com.cim.idm.service;
import com.cim.idm.model.*;
import com.cim.idm.model.dto.StoragePrintDto;
import com.cim.idm.wmsextend.generic.errorHandler.CustomException;
/**

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

@ -24,7 +24,7 @@
</foreach>
</update>
<select id="getPurchase" resultType="com.cim.idm.model.MaterialReceiveRequest">
<select id="getPurchase" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
SELECT SITENAME, RECEIVEREQUESTNAME FROM MATERIALRECEIVEREQUEST
WHERE SITENAME = #{dto.siteName}
AND RECEIVEREQUESTTYPE IN
@ -130,7 +130,7 @@
) TTT
</select>
<select id="getByKey" resultType="com.cim.idm.model.MaterialReceiveRequest">
<select id="getByKey" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
@ -142,7 +142,7 @@
AND RECEIVEREQUESTNAME = #{receiveRequestName}
</select>
<select id="getReceiveByDelivery" resultType="com.cim.idm.model.MaterialReceiveRequest">
<select id="getReceiveByDelivery" resultType="com.cim.idm.model.po.MaterialReceiveRequest">
SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO,
OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER,
LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID,
@ -154,7 +154,7 @@
AND DELIVERYNAME = #{receiveRequestName}
</select>
<select id="getReceiveDetail" resultType="com.cim.idm.model.MaterialReceiveRequestDetail">
<select id="getReceiveDetail" resultType="com.cim.idm.model.po.MaterialReceiveRequestDetail">
SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, POCATEGORY, RECEIVEREQUESTDETAILTYPE,
MATERIALSPECNAME, DESCRIPTION, REQUESTQUANTITY, RECEIVEDQUANTITY, ERPLOCATION, RETURNFLAG, FREEFLAG,
RECEIVEREQUESTDETAILSTATE, HOLDSTATE, IQCFLAG, PLANDATE, CREATEUSER, CREATETIME, CHARGE, ERPFACTORY,