组盘页面组盘按钮移到下面，入库打印页面加字段,登录页面logo

pengcheng
1 parent e0ad9d1e
Showing 13 changed files with 175 additions and 37 deletions
src/main/java/com/huaheng/pc/barcode/barcodeDetail/controller/BarCodeDetailController.java
src/main/java/com/huaheng/pc/barcode/barcodeDetail/service/BarCodeDetailService.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
src/main/java/com/huaheng/pc/vehicle/vehicleReceipt/controller/VehicelReceiptController.java
src/main/java/com/huaheng/pc/vehicle/vehicleShipment/controller/VehicelShipmentController.java
src/main/resources/templates/login.html
src/main/resources/templates/receipt/receiptHeader/report.html
src/main/resources/templates/receipt/receiving/receiving.html
@@ -187,6 +187,17 @@ public class BarCodeDetailController extends BaseController {
         return barCodeDetailService.createRegenerationCode(status);
     }
+    /**
+     * 批量修改白班、再生批号
+     */
+    @ApiOperation(value="批量修改白班、再生批号 ", notes="批量修改白班、再生批号 ", httpMethod = "POST")
+    @Log(title = "入库-入库单-获取再生编号 ",operating = "批量修改白班、再生批号 ", action = BusinessType.INSERT)
+    @PostMapping("/batchEdit")
+    @ResponseBody
+    public AjaxResult batchEdit(BarCodeDetail barCodeDetail) {
+        return barCodeDetailService.batchEdit(barCodeDetail);
+    }
+
 }
@@ -173,4 +173,30 @@ public class BarCodeDetailService extends ServiceImpl&lt;BarCodeDetailMapper, BarCo
         return AjaxResult.success("操作成功",result);
     }
+    /**
+     *  批量修改白班、再生批号
+     * @return
+     */
+    public AjaxResult batchEdit(BarCodeDetail barCodeDetail){
+        if(barCodeDetail==null){
+            return AjaxResult.error("请填写值");
+        }
+        if(barCodeDetail.getReceiptId()==null){
+            return AjaxResult.error("请填写主表id");
+        }
+        LambdaQueryWrapper<BarCodeDetail> receiptDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        receiptDetailLambdaQueryWrapper.eq(BarCodeDetail::getReceiptId,barCodeDetail.getReceiptId());
+        List<BarCodeDetail> receiptDetailList =  list(receiptDetailLambdaQueryWrapper);
+        for(BarCodeDetail bcd : receiptDetailList) {
+            if(StringUtils.isNotEmpty(barCodeDetail.getDayShift())){
+                bcd.setDayShift(barCodeDetail.getDayShift());
+            }
+            if(StringUtils.isNotEmpty(barCodeDetail.getRegenerationCode())){
+                bcd.setRegenerationCode(barCodeDetail.getRegenerationCode());
+            }
+        }
+        this.updateBatchById(receiptDetailList);
+        return AjaxResult.success("操作成功");
+    }
+
 }
@@ -196,6 +196,7 @@ public class ReceiptContainerDetail implements Serializable {
     @ApiModelProperty(value="供应商编码")
     private String supplierCode;
+
     /**
      * 批次
      */
@@ -533,5 +534,20 @@ public class ReceiptContainerDetail implements Serializable {
     @ApiModelProperty(value="过磅单号")
     private String poundCode;
+    /**
+     * 电池类型名称
+     * @return
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="电池类型名称")
+    private String batteryTypesName;
+    /**
+     * 电池种类名称
+     * @return
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value="电池种类名称")
+    private String batteryPackTypeName;
+
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
@@ -262,7 +262,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             receiptDetailService.remove(receiptdelambda);
             //添加成品入库详情到入库详情表
             LambdaQueryWrapper<BarCodeHeader> barCodeHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-            barCodeHeaderLambdaQueryWrapper.eq(BarCodeHeader::getBarCodeHeaderCode,barCodeHeaderCode);
+            barCodeHeaderLambdaQueryWrapper.eq(BarCodeHeader::getId,barCodeHeaderId);
             BarCodeHeader barCodeHeader = barCodeHeaderService.getOne(barCodeHeaderLambdaQueryWrapper);
             if(barCodeHeader == null){
                 return AjaxResult.error("找不到主条码");
@@ -276,8 +276,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             receiptContainerDetailAdd(receiptContainerHeaders.get(0), receiptDetail, qty,  batteryPackageWeight,
                     containerCode, locationCode,barCodeHeaderCode,barCodeDetails,batteryBean);
             //更新入库header表状态，保存主条码
-            receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(receiptDetail.getReceiptId(),
-                    barCodeHeaderCode,barCodeHeader.getProType());
+            receiptDetailService.updateReceiptHeaderLastStatusByReceiptHeaderId(receiptDetail.getReceiptId(),barCodeHeader);
             //锁定成品入库信息
             barCodeHeader.setLocked(QuantityConstant.BARCODEHEADER_LOCKED);
             barCodeHeader.setLastUpdated(new Date());
@@ -1177,6 +1176,8 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         receiptHeader.setId(null);
         String receiptCode = receiptHeaderService.createCode(barCodeHeader.getReceiptType());
         receiptHeader.setCode(receiptCode);
+        receiptHeader.setBarCodeHeaderId(barCodeHeader.getId());
+        receiptHeader.setBarCodeHeaderCode(barCodeHeader.getBarCodeHeaderCode());
         receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
         receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
@@ -2,6 +2,7 @@ package com.huaheng.pc.receipt.receiptDetail.service;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.receipt.ReceiptBill;
+import com.huaheng.pc.barcode.barcodeHeader.domain.BarCodeHeader;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -35,7 +36,7 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
      */
     int updateReceiptHeaderLastStatus(Integer id);
-    int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id,String barCodeHeaderCode,String proType);
+    int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id, BarCodeHeader barCodeHeader);
     AjaxResult approval(String ids, Integer approval);
@@ -14,6 +14,7 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.config.HuaHengConfig;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.receipt.ReceiptBill;
+import com.huaheng.pc.barcode.barcodeHeader.domain.BarCodeHeader;
 import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
 import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
 import com.huaheng.pc.config.company.domain.Company;
@@ -580,14 +581,16 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     }
     @Override
-    public int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id,String barCodeHeaderCode,String proType){
+    public int updateReceiptHeaderLastStatusByReceiptHeaderId(Integer id, BarCodeHeader barCodeHeader){
         LambdaQueryWrapper<ReceiptDetail> lambdaDetails = Wrappers.lambdaQuery();
         lambdaDetails.eq(ReceiptDetail::getReceiptId, id);
         List<ReceiptDetail> receiptDetails = this.list(lambdaDetails);
         //查询出头表信息
         ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
-        if(StringUtils.isNotEmpty(barCodeHeaderCode)){
-            receiptHeader.setBarCodeHeaderCode(barCodeHeaderCode);
+        if(StringUtils.isNotEmpty(barCodeHeader.getBarCodeHeaderCode())){
+            receiptHeader.setBarCodeHeaderCode(barCodeHeader.getBarCodeHeaderCode());
+            receiptHeader.setBarCodeHeaderId(barCodeHeader.getId());
+            receiptHeader.setProType(barCodeHeader.getProType());
         }
         BigDecimal totalqty=new BigDecimal(0);
         int minStatus;
@@ -630,7 +633,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
                 break;
             }
         }
-        receiptHeader.setProType(proType);
+
         receiptHeader.setTotalQty(totalqty);
         receiptHeader.setTotalLines(receiptDetails.size());
         receiptHeader.setLastStatus(minStatus);
@@ -18,13 +18,18 @@ import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.supplier.domain.Supplier;
+import com.huaheng.pc.config.supplier.service.SupplierService;
 import com.huaheng.pc.monitor.job.domain.datas;
+import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
+import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
 import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
 import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryService;
+import com.huaheng.pc.system.dict.service.IDictDataService;
 import com.huaheng.pc.system.role.service.IRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -56,9 +61,15 @@ public class ReceiptHeaderController extends BaseController {
     @Resource
     private ReceiptDetailService receiptDetailService;
     @Resource
+    private ReceiptContainerDetailService receiptContainerDetailService;
+    @Resource
     private TaskReturnService taskReturnService;
     @Resource
     private IRoleService iRoleService;
+    @Resource
+    private SupplierService supplierService;
+    @Resource
+    private IDictDataService dictDataService;
     @RequiresPermissions("receipt:receiptHeader:view")
@@ -279,12 +290,32 @@ public class ReceiptHeaderController extends BaseController {
     public String report(@ApiParam(name = "id", value = "入库头表id")
                          @PathVariable("id") Integer id, ModelMap mmap) {
         ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
-        mmap.put("receiptHeader", receiptHeader);
+
         //查询对应入库明细
-        LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
-        List<ReceiptDetail> details = receiptDetailService.list(lambdaQueryWrapper);
+        LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptId, id);
+        List<ReceiptContainerDetail> details = receiptContainerDetailService.list(lambdaQueryWrapper);
+        for (ReceiptContainerDetail receiptContainerDetail:details){
+            LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
+            companyLambda.eq(Supplier::getCode, receiptContainerDetail.getSupplierCode());
+            Supplier supplier = supplierService.getOne(companyLambda);
+            String name=null;
+            if (supplier != null) {
+                name=supplier.getName();
+            }
+            receiptContainerDetail.setCompanyName(name);
+            if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryTypes())){
+                String batteryTypes=dictDataService.selectDictLabel("batteryTypes",receiptContainerDetail.getBatteryTypes());
+                receiptContainerDetail.setBatteryTypesName(batteryTypes);
+            }
+            if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryPackType())){
+                String batteryPackType=dictDataService.selectDictLabel("batteryPackType",receiptContainerDetail.getBatteryPackType());
+                receiptContainerDetail.setBatteryPackTypeName(batteryPackType);
+            }
+        }
+        receiptHeader.setTotalLines(details.size());
+        mmap.put("receiptHeader", receiptHeader);
         mmap.put("details", details);
         return prefix + "/report";
@@ -369,6 +369,13 @@ public class ReceiptHeader implements Serializable {
     @TableField(value = "pushSuccessStatus")
     @ApiModelProperty(value="回传状态，0默认，1成功，2失败")
     public Integer pushSuccessStatus;
+    /**
+     * 成品入库主表id
+     * @return
+     */
+    @TableField(value = "barCodeHeaderId")
+    @ApiModelProperty(value="成品入库主表id")
+    private Integer barCodeHeaderId;
     /**
      * 主条码
@@ -13,6 +13,7 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
 import com.huaheng.pc.vehicle.vehicleReceipt.service.VehicleReceiptService;
@@ -159,6 +160,17 @@ public class VehicelReceiptController extends BaseController {
         }
     }
-
+    /**
+     * 车辆入库打印
+     */
+    @ApiOperation(value = "车辆入库打印", notes = "车辆入库打印", httpMethod = "POST")
+    @Log(title = "车辆入库-入库单", operating = "车辆入库打印", action = BusinessType.OTHER)
+    @GetMapping("/report/{id}")
+    public String report(@ApiParam(name = "id", value = "id")
+                         @PathVariable("id") Integer id, ModelMap mmap) {
+        VehicleReceipt vehicleReceipt= vehicleReceiptService.getById(id);
+        mmap.put("vehicleReceipt", vehicleReceipt);
+        return prefix + "/report";
+    }
 }
@@ -13,6 +13,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
 import com.huaheng.pc.vehicle.vehicleShipment.domain.VehicleShipment;
 import com.huaheng.pc.vehicle.vehicleShipment.service.VehicleShipmentService;
@@ -134,6 +136,17 @@ public class VehicelShipmentController extends BaseController {
         return prefix + "/gemVehicleShipment";
     }
-
+    /**
+     * 车辆出库打印
+     */
+    @ApiOperation(value = "车辆出库打印", notes = "车辆出库打印", httpMethod = "POST")
+    @Log(title = "入库-入库单", operating = "车辆出库打印", action = BusinessType.OTHER)
+    @GetMapping("/report/{id}")
+    public String report(@ApiParam(name = "id", value = "id")
+                         @PathVariable("id") Integer id, ModelMap mmap) {
+        VehicleShipment vehicleShipment = vehicleShipmentService.getById(id);
+        mmap.put("vehicleShipment", vehicleShipment);
+        return prefix + "/report";
+    }
 }
@@ -35,7 +35,7 @@
         <div class="col-sm-6">
             <div class="signin-info">
                 <div class="logopanel m-b">
-                    <h1><img alt="[ 华恒 ]" src="../static/huaheng.png" th:src="@{/huaheng.png}"></h1>
+                    <h1><img alt="[ 华恒 ]" src="../static/huaheng.png" th:src="@{/img/huaheng.png}"></h1>
                 </div>
                 <div class="m-b"></div>
                 <h4>欢迎使用 <strong>华恒仓库管理系统v2.1</strong></h4>
@@ -8,14 +8,14 @@
         <table id="reportTable" width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report">
             <thead style="display:table-header-group;">
             <tr>
-                <td colspan="7">
+                <td colspan="10">
                     <span style="padding-top:40px;width: 40%; float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
                     <h2 style="width:20%;text-align:center;float:left;padding-top:10px;">入库单</h2>
                     <span style="padding-top:20px;width:38%;float:right; text-align: right"><img id="receiptCode" th:src="@{'/image/'+${receiptHeader.code}}"></span>
                 </td>
             </tr>
             <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
-                <td colspan="7">
+                <td colspan="10">
                     <div style="width:50%; float:right; text-align:right">
                         <span>明细条数：<span th:text="${receiptHeader['totalLines']}"></span></span>
                         <span style="padding-left:20px;">明细总数：<span th:text="${receiptHeader['totalQty']}"></span></span>
@@ -24,24 +24,40 @@
                 </td>
             </tr>
             <tr>
-                <th width="18%">物料编码</th>
-                <th width="22%">物料名称</th>
-                <th width="10%">批次</th>
-                <th width="9%">批号</th>
-                <th width="11%">工程号</th>
-                <th width="9%">数量</th>
-                <th width="21%">条码</th>
+                <th width="">物料编码</th>
+                <th width="">物料名称</th>
+                <!--<th width="10%">批次</th>
+                <th width="9%">批号</th>-->
+                <!--<th width="">工程号</th>-->
+                <th width="">数量</th>
+                <th width="">磅单编号</th>
+                <th width="">电池类型</th>
+                <th width="">电池种类</th>
+                <th width="">批号</th>
+                <th width="">供应商</th>
+                <th width="">国家编码</th>
+                <th width="">回收人</th>
+                <th width="">电池二维码</th>
+                <!--<th width="21%">条码</th>-->
             </tr>
             </thead>
             <tbody>
             <tr th:each="row,rowStat : ${details}">
                 <td th:text="${row.materialCode}"></td>
                 <td th:text="${row.materialName}"></td>
-                <td th:text="${row.batch}"></td>
+                <!--<td th:text="${row.batch}"></td>
                 <td th:text="${row.lot}"></td>
-                <td th:text="${row.projectNo}"></td>
-                <td th:text="${row.totalQty}"></td>
-                <td><img th:src="@{'/image/'+${row.materialCode}}"></td>
+                <td th:text="${row.projectNo}"></td>-->
+                <td th:text="${row.qty}"></td>
+                <td th:text="${row.poundCode}"></td>
+                <td th:text="${row.batteryTypesName}"></td>
+                <td th:text="${row.batteryPackTypeName}"></td>
+                <td th:text="${row.lot}"></td>
+                <td th:text="${row.companyName}"></td>
+                <td th:text="${row.countryCode}"></td>
+                <td th:text="${row.recycler}"></td>
+                <td><img th:src="@{'/image/'+${row.batteryPackTwoCode}}"></td>
+                <!--<td><img th:src="@{'/image/'+${row.materialCode}}"></td>-->
             </tr>
             </tbody>
         </table>
@@ -51,7 +67,6 @@
 <script type="text/javascript" src="../../../js/barcode/JsBarcode.all.js"></script>
 <script type="text/javascript" src="//static.runoob.com/assets/qrcode/qrcode.min.js"></script>
 <script th:inline="javascript">
-
     var  barcodeStyle = {
         format: "CODE128",//选择要使用的条形码类型
         width:1,//设置条之间的宽度
@@ -46,7 +46,7 @@
 		margin-bottom: 0px;
 		line-height: 34px;
 	}
-	.table-striped-right .select-list li{
+	.table-striped-left .select-list li{
 		width:47%;
 		float:left;
 	}
@@ -107,9 +107,7 @@
 		<div class="col-sm-12 select-info table-striped-left" style="padding-top: 20px;">
 			<!--组盘输入区 -->
-			<div>
-				<button class="btn btn-danger" onclick="receipt()">组&nbsp&nbsp&nbsp盘</button>
-			</div>
+
 			<ul class="select-list">
 				<input type="text" id="materialCode" hidden/>
 				<li style="display: none">id：<input type="text" id="detailId"/></li>
@@ -170,11 +168,12 @@
 					<!--<li>回收人：<input type="text"  id="recycler"/></li>-->
 					<li>国家编码：<input type="text" id="countryCode" placeholder="请用pda扫码获取"/></li>
 					<li>备注：<input type="text" id="remark" placeholder="备注"/></li>
-					<li>
+					<!--<li>
+
+					</li>-->
+					<li><div class="form-group" style="width:80%;white-space: nowrap">
+						<img id="camera" name="camera" src="" width="250px" height="200px"/>
 						<button id="plc" name="plc" class="btn btn-danger btn-sm" type="button">电池拍照</button>
-					</li>
-					<li><div class="form-group" style="width:300px;white-space: nowrap">
-						<img id="camera" name="camera" src="" width="300px" height="200px"/>
 					</div></li>
 					<!--<div class="form-group" style="width:300px;white-space: nowrap">
@@ -193,6 +192,9 @@
 					</li>-->
 				</div>
 			</ul>
+			<div style="padding-left:37%;">
+				<button class="btn btn-danger" style="width:150px;" onclick="receipt()">组&nbsp&nbsp&nbsp盘</button>
+			</div>
 		</div>
 		<div class="col-sm-12  table-striped-right" style="padding-top: 13px;">
 			<!--需要组盘入库明细 -->