手持直接输托盘和物料编码入库

游杰
1 parent 68c6faeb
Showing 7 changed files with 16 additions and 9 deletions
src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
src/main/resources/templates/receipt/receiptDetail/add.html
src/main/resources/templates/receipt/receiptHeader/add.html
@@ -239,7 +239,7 @@ public class MobileBatchReceiptController {
         if(container == null) {
             throw new JSONException("不存在这个托盘");
         }
-        if(locationCode.equals(container.getLocationCode())) {
+        if(locationCode != null && locationCode.equals(container.getLocationCode())) {
             /* 查询未完成的入库任务*/
             LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
             taskQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
@@ -308,12 +308,14 @@ public class MobileBatchReceiptController {
  
         } else {
             ReceiptContainerView record = new ReceiptContainerView();
-            record.setReceiptContainerCode(receiptBills.get(0).getReceiptContainerCode());
-            record.setLocationCode(receiptBills.get(0).getLocationCode());
+            record.setReceiptContainerCode(containerCode);
+            record.setLocationCode(locationCode);
             record.setTaskType((short)100);
             record.setCompanyCode(receiptBills.get(0).getCompanyCode());
             receiptContainerHeaderService.checkContainer(record);
-            receiptContainerHeaderService.mobileCheckLocationCode(record);
+            if(locationCode != null) {
+                receiptContainerHeaderService.mobileCheckLocationCode(record);
+            }
             int receiptHeaderId = receiptHeaderService.createTodayHeader(companyCode);
             ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
             List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, companyCode);
@@ -333,6 +335,7 @@ public class MobileBatchReceiptController {
                 return AjaxResult.error("插入入库明细表单失败");
             }
         }
+
         return AjaxResult.success("收货成功");
     }
  
@@ -165,10 +165,12 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
             record.setMaterialName(material.getName());
             record.setMaterialSpec(material.getSpec());
             record.setQty(receiptBill.getQty());
+            record.setContainerCode(receiptBills.get(0).getReceiptContainerCode());
             if(receiptBill.getWeight() != null) {
                 record.setWeight(receiptBill.getWeight());
             }
             record.setCreatedBy(ShiroUtils.getLoginName());
+            record.setLastUpdatedBy(ShiroUtils.getLoginName());
  
             LambdaQueryWrapper<ReceiptContainerDetail> detailyWrapper = Wrappers.lambdaQuery();
             detailyWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, headerId)
@@ -480,6 +480,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         recorder.setTaskType(String.valueOf(QuantityConstant.TASK_TYPE_WHOLERECEIPT));
         recorder.setStatus((short) 0);
         recorder.setCreatedBy(ShiroUtils.getLoginName());
+        recorder.setLastUpdatedBy(ShiroUtils.getLoginName());
  
         LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambada = Wrappers.lambdaQuery();
         receiptContainerHeaderLambada.eq(ReceiptContainerHeader::getContainerCode, receiptContainerCode)
@@ -461,6 +461,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
             receiptDetail.setDeleted(false);
             receiptDetail.setBatch(receiptBill.getBatch());
+            receiptDetail.setCompanyCode(companyCode);
             save(receiptDetail);
             mReceiptDetailIds.add(receiptDetail.getId());
         }
@@ -61,7 +61,7 @@
     </select>
  
   <select id="createCode" resultType="java.lang.String">
-        SELECT code FROM receipt_header WHERE type = #{receiptType,jdbcType=VARCHAR} ORDER BY id DESC LIMIT 1
+        SELECT code FROM receipt_header WHERE receiptType = #{receiptType,jdbcType=VARCHAR} ORDER BY id DESC LIMIT 1
   </select>
   <select id="getLatestReceipt" resultType="com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader">
      select * from receipt_header order by id desc  limit 10
@@ -134,8 +134,8 @@
         <!--</div>-->
         <div class="form-group">
             <div class="form-control-static col-sm-offset-9">
-                <button type="submit" class="btn btn-primary" style="position: fixed">提交</button>
-                <button onclick="$.modal.close()" class="btn btn-danger" type="button" style="position: fixed">关闭</button>
+                <button type="submit" class="btn btn-primary" >提交</button>
+                <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
             </div>
         </div>
     </form>
@@ -41,8 +41,8 @@
 			</div>
 			<div class="form-group">
 				<div class="form-control-static col-sm-offset-9">
-					<button type="submit" class="btn btn-primary" style="position: fixed" >提交</button>
-					<button onclick="$.modal.close()" class="btn btn-danger" type="button"  style="position: fixed">关闭</button>
+					<button type="submit" class="btn btn-primary" >提交</button>
+					<button onclick="$.modal.close()" class="btn btn-danger" type="button" >关闭</button>
 				</div>
 			</div>
 		</form>