zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BUG修改

master
叶佳兴 2 years ago
parent
d00c4bc21c
commit
f3db467b86
3 changed files with 56 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java
  2. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java
  3. 56
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

12
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java
View File

@ -3,7 +3,10 @@ package com.win.module.wms.controller.supplierdeliverRecord;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailRespVO;
import com.win.module.wms.controller.supplierdeliverRecord.vo.*;
import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert;
import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -116,4 +119,13 @@ public class SupplierdeliverRecordDetailController {
ExcelUtils.write(response, "供应商发货记录子.xls", "数据", SupplierdeliverRecordDetailExcelVO.class, datas);
}
// @GetMapping("/allList")
// @Operation(summary = "高级搜索获得供应商发货记录子信息")
// @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:allList')")
// public CommonResult<List<SupplierdeliverRecordDetailRespVO>> selectAllList(@RequestParam String number) {
// List<SupplierdeliverRecordDetailDO> list = supplierdeliverRecordDetailService.selectAllList(number);
// List<SupplierdeliverRecordDetailRespVO> result = SupplierdeliverRecordDetailConvert.INSTANCE.convertList(list);
// return success(result);
// }
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java
View File

@ -153,5 +153,10 @@ public class SupplierdeliverRecordDetailBaseVO {
@Schema(description = "到批次")
private String toBatch;
/**
* 主表ID
*/
private Long masterId;
}

56
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java
View File

@ -30,6 +30,8 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptR
import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
import com.win.module.wms.dal.dataobject.shift.ShiftDO;
import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestDetailDO;
import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO;
import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
@ -639,7 +641,6 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
return result;
}
/**
* 处理操作（生成记录，生成采购收货申请）
*
@ -671,24 +672,36 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
supplierdeliverRecordMainCreateReqVO.setExecuteTime(LocalDateTime.now());
supplierdeliverRecordMainCreateReqVO.setActiveDate(LocalDateTime.now());
supplierdeliverRecordMainCreateReqVO.setDepartmentCode(mainDO.getDepartmentCode());
supplierdeliverRecordMainMapper.insert(SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMainCreateReqVO));
SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = SupplierdeliverRecordMainConvert.INSTANCE.convert(supplierdeliverRecordMainCreateReqVO);
supplierdeliverRecordMainDO.setId(null);
supplierdeliverRecordMainDO.setCreator(null);
supplierdeliverRecordMainDO.setCreateTime(null);
supplierdeliverRecordMainDO.setUpdater(null);
supplierdeliverRecordMainDO.setUpdateTime(null);
supplierdeliverRecordMainMapper.insert(supplierdeliverRecordMainDO);
for (SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO : detailDOList) {
SupplierdeliverRecordDetailCreateReqVO supplierdeliverRecordDetailCreateReqVO = new SupplierdeliverRecordDetailCreateReqVO();
BeanUtils.copyProperties(supplierdeliverRequestDetailDO, supplierdeliverRecordDetailCreateReqVO);
supplierdeliverRecordDetailCreateReqVO.setNumber(number);
supplierdeliverRecordDetailCreateReqVO.setFromPackingNumber("");
supplierdeliverRecordDetailCreateReqVO.setToPackingNumber("");
supplierdeliverRecordDetailCreateReqVO.setFromBatch("");
supplierdeliverRecordDetailCreateReqVO.setToBatch("");
supplierdeliverRecordDetailCreateReqVO.setAltBatch("");
supplierdeliverRecordDetailCreateReqVO.setFromContainerNumber("");
supplierdeliverRecordDetailCreateReqVO.setToContainerNumber("");
SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = new SupplierdeliverRecordDetailDO();
BeanUtils.copyProperties(supplierdeliverRequestDetailDO, supplierdeliverRecordDetailDO);
supplierdeliverRecordDetailDO.setNumber(number);
supplierdeliverRecordDetailDO.setMasterId(supplierdeliverRecordMainDO.getId());
supplierdeliverRecordDetailDO.setFromPackingNumber("");
supplierdeliverRecordDetailDO.setToPackingNumber("");
supplierdeliverRecordDetailDO.setFromBatch("");
supplierdeliverRecordDetailDO.setToBatch("");
supplierdeliverRecordDetailDO.setAltBatch("");
supplierdeliverRecordDetailDO.setFromContainerNumber("");
supplierdeliverRecordDetailDO.setToContainerNumber("");
SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), supplierdeliverRequestDetailDO.getItemCode());
supplierdeliverRecordDetailCreateReqVO.setToLocationCode(supplieritemDO.getDefaultLocationCode());
supplierdeliverRecordDetailDO.setToLocationCode(supplieritemDO.getDefaultLocationCode());
LocationDO locationDO = locationService.selectLocation(supplieritemDO.getDefaultLocationCode());
supplierdeliverRecordDetailCreateReqVO.setToAreaCode(locationDO.getAreaCode());
supplierdeliverRecordDetailCreateReqVO.setToLocationGroupCode(locationDO.getLocationGroupCode());
supplierdeliverRecordDetailMapper.insert(SupplierdeliverRecordDetailConvert.INSTANCE.convert(supplierdeliverRecordDetailCreateReqVO));
supplierdeliverRecordDetailDO.setToAreaCode(locationDO.getAreaCode());
supplierdeliverRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode());
supplierdeliverRecordDetailDO.setId(null);
supplierdeliverRecordDetailDO.setCreator(null);
supplierdeliverRecordDetailDO.setCreateTime(null);
supplierdeliverRecordDetailDO.setUpdater(null);
supplierdeliverRecordDetailDO.setUpdateTime(null);
supplierdeliverRecordDetailMapper.insert(supplierdeliverRecordDetailDO);
}
//生成采购收货申请 叶佳兴
@ -696,6 +709,11 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
BeanUtils.copyProperties(mainDO, purchasereceiptRequestMainDO);
String number2 = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_REQUEST.getCode());
purchasereceiptRequestMainDO.setNumber(number2);
purchasereceiptRequestMainDO.setId(null);
purchasereceiptRequestMainDO.setCreator(null);
purchasereceiptRequestMainDO.setCreateTime(null);
purchasereceiptRequestMainDO.setUpdater(null);
purchasereceiptRequestMainDO.setUpdateTime(null);
purchasereceiptRequestMainMapper.insert(purchasereceiptRequestMainDO);
for (SupplierdeliverRequestDetailDO detailDO : detailDOList) {
//包装
@ -723,8 +741,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode());
purchasereceiptRequestDetailDO.setDefaultToLocationCode(supplieritemDO.getDefaultLocationCode());
purchasereceiptRequestDetailDO.setRemark(null);
purchasereceiptRequestDetailDO.setCreateTime(LocalDateTime.now());
purchasereceiptRequestDetailDO.setSiteId(null);
purchasereceiptRequestDetailDO.setId(null);
purchasereceiptRequestDetailDO.setCreator(null);
purchasereceiptRequestDetailDO.setCreateTime(null);
purchasereceiptRequestDetailDO.setUpdater(null);
purchasereceiptRequestDetailDO.setUpdateTime(null);
purchasereceiptRequestDetailMapper.insert(purchasereceiptRequestDetailDO);
}
//更新要货计划的已发货数量

Write Preview
Loading…
Cancel
Save