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

库内管理-批次属性修改

Browse Source
This commit is contained in:
王帅 2025-05-22 17:48:55 +08:00
parent a814ce7612
commit 8a93d0999f
7 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,13 @@ package com.cim.idm.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.model.MaterialPacking;
import com.cim.idm.model.dto.MaterialNotPostedDto;
import com.cim.idm.service.CostCenterService;
import com.cim.idm.utils.AjaxResult;
import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.web.bind.annotation.*;
@ -18,6 +21,8 @@ import java.util.stream.Collectors;
@EnableAutoConfiguration
public class MaterialPackingController {
@Autowired
private CostCenterService costCenterService;
/**
* 更新未入账
*/
@ -35,14 +40,23 @@ public class MaterialPackingController {
MaterialPackingServiceProxy.getMaterialPackingService().selectByKey(collect);
// 修改
for (com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking materialPacking : materialPackings) {
// 批次号
/*// 批次号
materialPacking.setCharge(sl.getCHARGE());
// 保质期
materialPacking.setExpiringDate(Timestamp.valueOf(sl.getEXPIRNGDATE()));
// 制造日期
materialPacking.setMakeDate(Timestamp.valueOf(sl.getMAKEDATE()));
materialPacking.setMakeDate(Timestamp.valueOf(sl.getMAKEDATE()));*/
// 阶段
materialPacking.setPHASE(sl.getPHASE());
}
MaterialPackingServiceProxy.getMaterialPackingService().update(materialPackings);
return AjaxResult.me().setSuccess(true).setMessage("过账成功");
}
@PostMapping(value = "/handelEdit")
public AjaxResult handelEdit(@RequestBody MaterialPacking materialPacking) {
costCenterService.editMaterialPackingName(materialPacking);
return AjaxResult.me().setSuccess(true).setMessage("编辑成功");
}
}

6
zi-wms-pda/src/main/java/com/cim/idm/dao/CostCenterDao.java
View File

@ -43,4 +43,10 @@ public interface CostCenterDao {
@Param("saleshiprequestdetailname") String saleshiprequestdetailname);
void updateCheckMain(@Param("mainId") String mainId);
void editMaterialPackingName(@Param("siteName") String siteName,
@Param("materialPackingName") String materialPackingName,
@Param("charge") String charge,
@Param("materialPackingNameNew") String materialPackingNameNew,
@Param("remark") String remark);
}

1
zi-wms-pda/src/main/java/com/cim/idm/model/MaterialPacking.java
View File

@ -37,4 +37,5 @@ public class MaterialPacking {
private String durableType;
private String opCode;
private String desc_cn;
private String remark;
}

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

@ -19,6 +19,8 @@ public class MaterialNotPostedDto {
// 规格
private String SITENAME;
/**阶段*/
private String PHASE;
// 数据
private List<MaterialPacking> dataList;

3
zi-wms-pda/src/main/java/com/cim/idm/service/CostCenterService.java
View File

@ -2,6 +2,7 @@ package com.cim.idm.service;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.model.CostCenter;
import com.cim.idm.model.MaterialPacking;
import java.util.List;
import java.util.Map;
@ -17,4 +18,6 @@ public interface CostCenterService {
* @param mainId
*/
void updateCheckMain(String mainId);
void editMaterialPackingName(MaterialPacking materialPacking);
}

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

@ -5,11 +5,15 @@ import cn.hutool.core.lang.UUID;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.cim.idm.dao.CostCenterDao;
import com.cim.idm.data.ErpMessageLog;
import com.cim.idm.exception.GlobalException;
import com.cim.idm.framework.util.time.TimeStampUtil;
import com.cim.idm.model.CostCenter;
import com.cim.idm.model.po.MaterialReceiveRequest;
import com.cim.idm.service.CostCenterService;
import com.cim.idm.service.impl.ToSAPServiceImpl;
import com.cim.idm.util.MessageLogUtil;
import com.cim.idm.util.ToSAPMessageUtil;
import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@ -124,4 +128,29 @@ public class CostCenterServiceImpl implements CostCenterService {
public void updateCheckMain(String mainId) {
costCenterDao.updateCheckMain(mainId);
}
@Override
public void editMaterialPackingName(com.cim.idm.model.MaterialPacking materialPacking) {
// 批次号
String charge = materialPacking.getCharge();
String siteName = materialPacking.getSiteName();
String remark = materialPacking.getRemark();
// 原标签
String materialPackingName = materialPacking.getMaterialPackingName();
String regex = "\\|\\|(.*?)\\|";
// 新标签
String materialPackingNameNew = materialPackingName.replaceAll(regex, "||" + charge + "|");
costCenterDao.editMaterialPackingName(siteName,materialPackingName,charge,materialPackingNameNew,remark);
//将log写到表里
ErpMessageLog erplog = new ErpMessageLog();
erplog.setEventUser(materialPacking.getUser());
erplog.setServerName("WmsToWms");
erplog.setEventName("在库属性变更");
erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT));
erplog.setMessageId(java.util.UUID.randomUUID().toString());
erplog.setSendMsg(materialPacking.toString());
erplog.setSendMsg2(materialPacking.toString());
erplog.setReturnMsg2(materialPacking.toString());
MessageLogUtil.writeMessageLog(erplog);
}
}

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

@ -42,4 +42,11 @@
update MATERIALPACKINGCHECK_MAIN set STATUS = '1'
where ID = #{mainId, jdbcType=VARCHAR}
</update>
<update id="editMaterialPackingName">
update MATERIALPACKING set REMARK = #{remark, jdbcType=VARCHAR},CHARGE = #{charge, jdbcType=VARCHAR},
MATERIALPACKINGNAME = #{materialPackingNameNew, jdbcType=VARCHAR}
WHERE MATERIALPACKINGNAME = #{materialPackingName, jdbcType=VARCHAR}
and SITENAME = #{siteName, jdbcType=VARCHAR}
</update>
</mapper>