wms / wms_guangzhouwanbao · Commits

Commit f53fb3adf560367ae89fb9ddeb68b8c7910c1160

Authored by pengcheng
1 parent 6dfde5af

多仓设置时，入库配置等都要以仓库区分

Inline Side-by-side
Showing 5 changed files with 13 additions and 8 deletions
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @f53fb3a
... ... @@ -198,7 +198,8 @@ public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, R
198 198  
199 199 //查询头表中绑定的入库类型中的入库流程
200 200 LambdaQueryWrapper<ReceiptType> lambdaReceiptType = Wrappers.lambdaQuery();
201   - lambdaReceiptType.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
  201 + lambdaReceiptType.eq(ReceiptType::getCode, receiptHeader.getReceiptType())
  202 + .eq(ReceiptType::getWarehouseCode,ShiroUtils.getWarehouseCode());
202 203 ReceiptType receiptType = receiptTypeService.getOne(lambdaReceiptType);
203 204  
204 205  
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @f53fb3a
... ... @@ -55,7 +55,8 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
55 55 */
56 56 public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){
57 57 LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
58   - lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
  58 + lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType())
  59 + .eq(ReceiptType::getWarehouseCode,ShiroUtils.getWarehouseCode());
59 60 ReceiptType receiptType = receiptTypeService.getOne(lambdaQueryWrapper);
60 61  
61 62 //流程详情查询
... ...
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
  View file @f53fb3a
... ... @@ -115,7 +115,8 @@ public class ReceivingService {
115 115 .eq(ConfigValue::getRecordType, "入库首选项");
116 116 ConfigValue configValue = configValueService.getOne(configValueLambda);
117 117 LambdaQueryWrapper<ReceiptPreference> lambdaQueryWrapper = Wrappers.lambdaQuery();
118   - lambdaQueryWrapper.eq(ReceiptPreference::getCode, configValue.getValue());
  118 + lambdaQueryWrapper.eq(ReceiptPreference::getCode, configValue.getValue())
  119 + .eq(ReceiptPreference::getWarehouseCode,ShiroUtils.getWarehouseCode());
119 120 ReceiptPreference receiptPreference = preferenceService.getOne(lambdaQueryWrapper);
120 121 locatingRule = preferenceService.getOne(lambdaQueryWrapper).getLocationRule();
121 122 }
... ... @@ -127,7 +128,8 @@ public class ReceivingService {
127 128 throw new ServiceException("未绑定定位规则");
128 129 }
129 130 LambdaQueryWrapper<FilterConfigDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
130   - lambdaQueryWrapper.eq(FilterConfigDetail::getCode, locatingRule);
  131 + lambdaQueryWrapper.eq(FilterConfigDetail::getCode, locatingRule)
  132 + .eq(FilterConfigDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
131 133 FilterConfigDetail filterConfigDetail = filterConfigDetailService.getOne(lambdaQueryWrapper);
132 134  
133 135 //根据定位规则查询库位编码
... ...
src/main/java/com/huaheng/pc/shipment/wave/service/WaveService.java
  View file @f53fb3a
... ... @@ -59,7 +59,8 @@ public class WaveService extends ServiceImpl&lt;WaveMapper, Wave&gt; {
59 59  
60 60 //1、查看此波次的状态,状态不为o时，无法开始波次
61 61 Wave wave = this.getById(id);
62   - if(wave == null || wave.getStatus() != QuantityConstant.WAVE_STATUS_BUILD){
  62 + if(wave == null || (wave.getStatus()> QuantityConstant.WAVE_STATUS_BUILD &&
  63 + wave.getStatus() < QuantityConstant.WAVE_STATUS_FAILED)){
63 64 return AjaxResult.error("id为"+id+"的波次找不到，或者状态不能做开始操作");
64 65 }
65 66 waves.add(wave);
... ...
src/main/resources/templates/receipt/receiptHeader/add.html
  View file @f53fb3a
... ... @@ -14,10 +14,10 @@
14 14 </div>
15 15 </div>
16 16 <div class="form-group">
17   - <label class="col-sm-3 control-label">货主：</label>
  17 + <label class="col-sm-3 control-label">货主编码：</label>
18 18 <div class="col-sm-8">
19   - <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.getCode()}">
20   - <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
  19 + <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
  20 + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
21 21 </select>
22 22 </div>
23 23 </div>
... ...