Merge remote-tracking branch 'origin/develop' into develop

tongzhonghao
2 parents 66b7b19d 6490fc04
Showing 15 changed files with 237 additions and 91 deletions
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/controller/ReceiptContainerDetailController.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.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/controller/ReceiptDetailController.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/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/resources/mybatis/receipt/ReceiptContainerDetailMapper.xml
src/main/resources/mybatis/shipment/ShipmentContainerDetailMapper.xml
src/main/resources/templates/receipt/receiptContainerDetail/reportBatteryPackage.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
src/main/resources/templates/receipt/receiving/receiving.html
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
@@ -13,6 +14,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.config.company.domain.Company;
+import com.huaheng.pc.config.company.service.CompanyService;
 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
@@ -20,13 +23,16 @@ import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 @Controller
@@ -35,6 +41,8 @@ public class ReceiptContainerDetailController extends BaseController {
     @Resource
     private ReceiptContainerDetailService receiptContainerDetailService;
+    @Resource
+    private CompanyService companyService;
     private String prefix = "receipt/receiptContainerDetail";
@@ -115,4 +123,31 @@ public class ReceiptContainerDetailController extends BaseController {
         List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
         return toAjax(receiptContainerDetailService.detailRemove(idList));
     }
+
+    @RequiresPermissions("shipment:bill:report")
+    @Log(title = "入库-入库单", operating = "打印入库单明细报表", action = BusinessType.OTHER)
+    @GetMapping("/reportBatteryPackage/{ids}")
+    public String reportBatteryPackage(@PathVariable("ids") Integer[] ids, ModelMap mmap) {
+        List<ReceiptContainerDetail> list = new ArrayList<ReceiptContainerDetail>();
+        for (Integer id : ids) {
+            if (id != null) {
+                ReceiptContainerDetail receiptDetail = receiptContainerDetailService.getById(id);
+                if(StringUtils.isEmpty(receiptDetail.getBatteryPackTwoCode())){
+                    continue;
+                    //throw new ServiceException("系统没有此电池包信息" + receiptDetail.getBatteryPackTwoCode());
+                }
+                LambdaQueryWrapper<Company> companyLambda = Wrappers.lambdaQuery();
+                companyLambda.eq(Company::getCode, receiptDetail.getCompanyCode());
+                Company company = companyService.getOne(companyLambda);
+                if (company == null) {
+                    throw new ServiceException("系统没有此货主编码" + receiptDetail.getCompanyCode());
+                }
+                receiptDetail.setCompanyName(company.getName());
+                receiptDetail.setUserDef1(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+                list.add(receiptDetail);
+            }
+            mmap.put("receiptDetails", list);
+        }
+        return prefix + "/reportBatteryPackage";
+    }
 }
@@ -482,5 +482,10 @@ public class ReceiptContainerDetail implements Serializable {
     @ApiModelProperty(value="回收人")
     private String recycler;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "货主名称")
+    private String companyName;
+
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
@@ -15,7 +15,7 @@ public interface ReceiptContainerDetailService extends IService&lt;ReceiptContainer
      * @param receiptCode 入库单编码
      * @return AjaxResult
      */
-    AjaxResult<List<Map<String, Object>>> getReceiptInfoByBill(String receiptCode);
+    AjaxResult<List<ReceiptContainerDetail>> getReceiptInfoByBill(String receiptCode);
     /**
      * 撤销入库组盘明细
@@ -64,12 +64,12 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
      * @return AjaxResult
      */
     @Override
-    public AjaxResult<List<Map<String, Object>>> getReceiptInfoByBill(String receiptCode) {
+    public AjaxResult<List<ReceiptContainerDetail>> getReceiptInfoByBill(String receiptCode) {
         LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptCode, receiptCode)
                 .eq(ReceiptContainerDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
-        List<Map<String, Object>> detail = this.listMaps(lambdaQueryWrapper);
+        List<ReceiptContainerDetail> detail = this.list(lambdaQueryWrapper);
         return AjaxResult.success(detail);
     }
@@ -7,6 +7,7 @@ import com.huaheng.api.wcs.domain.WcsTask;
 import com.huaheng.api.wcs.service.warecellAllocation.WarecellAllocationService;
 import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.utils.DataUtils;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.bean.BeanUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -347,9 +348,34 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
         receiptDetailsave.setMaterialGrossWeight(materialGrossWeight);
         receiptDetailsave.setMaterialNetWeight(materialNetWeight);
         receiptDetailsave.setMaterialTareWeight(materialTareWeight);
+        //电池类才生成电池包二维码
+        String batteryPackTwoCode=findBatteryPackTwoCode(receiptDetailsave);
+        receiptDetailsave.setBatteryPackTwoCode(batteryPackTwoCode);
+
         receiptDetailService.updateById(receiptDetailsave);
     }
+    public String findBatteryPackTwoCode(ReceiptDetail receiptDetail){
+        String batteryPackTwoCode=null;
+        if(receiptDetail.getMaterialIsBattery()==1){
+            LambdaQueryWrapper<ReceiptContainerDetail> receiptDetailWrapper1 = Wrappers.lambdaQuery();
+            //receiptDetailWrapper1.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType()),ReceiptContainerDetail::getBatteryPackType, receiptDetail.getBatteryPackType());
+            // receiptDetailWrapper1.eq(StringUtils.isEmpty(receiptDetail.getBatteryPackType()),ReceiptDetail::getBatteryPackType, "P1");
+            receiptDetailWrapper1.orderByDesc(ReceiptContainerDetail::getBatteryPackTwoCode).last("Limit 1");
+            ReceiptContainerDetail detail1=receiptContainerDetailService.getOne(receiptDetailWrapper1);
+            String maxCode="0";
+            if(null!=detail1){
+                maxCode=detail1.getBatteryPackTwoCode();
+            }
+            batteryPackTwoCode= DataUtils.createSerialNumber(receiptDetail.getBatteryPackType(),maxCode,1);
+            /*if(StringUtils.isNotEmpty(receiptDetail.getBatteryPackType())){
+            }else{
+                batteryPackTwoCode= DataUtils.createSerialNumber("P1",maxCode,1);
+            }*/
+            return batteryPackTwoCode;
+        }
+        return batteryPackTwoCode;
+    }
     //成品入库组盘校验
     public void checkReciptContainer(String barCodeHeaderId){
         BarCodeHeader barCodeHeader = barCodeHeaderService.getById(barCodeHeaderId);
@@ -318,31 +318,7 @@ public class ReceiptDetailController extends BaseController {
         return prefix + "/report";
     }
-    @RequiresPermissions("shipment:bill:report")
-    @Log(title = "入库-入库单", operating = "打印入库单明细报表", action = BusinessType.OTHER)
-    @GetMapping("/reportBatteryPackage/{ids}")
-    public String reportBatteryPackage(@PathVariable("ids") Integer[] ids, ModelMap mmap) {
-        List<ReceiptDetail> list = new ArrayList<ReceiptDetail>();
-        for (Integer id : ids) {
-            if (id != null) {
-                ReceiptDetail receiptDetail = receiptDetailService.getById(id);
-                if(StringUtils.isEmpty(receiptDetail.getBatteryPackTwoCode())){
-                    throw new ServiceException("系统没有此电池包信息" + receiptDetail.getBatteryPackageCode());
-                }
-                LambdaQueryWrapper<Company> companyLambda = Wrappers.lambdaQuery();
-                companyLambda.eq(Company::getCode, receiptDetail.getCompanyCode());
-                Company company = companyService.getOne(companyLambda);
-                if (company == null) {
-                    throw new ServiceException("系统没有此货主编码" + receiptDetail.getCompanyCode());
-                }
-                receiptDetail.setCompanyName(company.getName());
-                receiptDetail.setUserDef1(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
-                list.add(receiptDetail);
-            }
-            mmap.put("receiptDetails", list);
-        }
-        return prefix + "/reportBatteryPackage";
-    }
+
     /**
      * 上传请求
@@ -66,4 +66,6 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
      * @return
      */
     List<ReceiptDetail> findByReceiptId(Integer id);
+    //生成电池包二维码
+    String findBatteryPackTwoCode(ReceiptDetail receiptDetail);
 }
@@ -116,22 +116,10 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         } else if (receiptHeader.getFirstStatus() == 20) {
             throw new ServiceException("单据已作废");
         }
-        receiptDetail.setReceiptCode(receiptHeader.getCode());
-
-//        LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
-//        receiptDetailLambdaQueryWrapper.eq(StringUtils.isNotEmpty(receiptDetail.getBatteryCode()),ReceiptDetail::getBatteryCode,receiptDetail.getBatteryCode());
-//        List<ReceiptDetail> receiptDetails = receiptDetailSerivece.list(receiptDetailLambdaQueryWrapper);
-//        if(receiptDetails.size()>0){
-//            return AjaxResult.error("电池编码不能重复");
-//        }
+        //receiptContainerDetailAdd
+        receiptDetail.setReceiptCode(receiptHeader.getCode());
-        /*if(StringUtils.isNotNull(receiptDetail.getReceiptWeight())){
-            double receiptWeightDouble = receiptDetail.getReceiptWeight().doubleValue();
-            if(!(receiptWeightDouble > 0  &&  receiptWeightDouble < 99999)){
-                return AjaxResult.error("入库质量 数值必须大于 0，小于 99999");
-            }
-        }*/
         /* 判断物料编码*/
         LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -142,9 +130,6 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             throw new ServiceException("物料不存在");
         }
         //生成电池包二维码
-
-
-
         receiptDetail.setCompanyCode(receiptHeader.getCompanyCode());
         receiptDetail.setMaterialCode(material.getCode());
         receiptDetail.setMaterialName(material.getName());
@@ -159,35 +144,30 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         String poundCode=findPoundCode(receiptDetail);
         receiptDetail.setPoundCode(poundCode);
-        receiptDetail.setUnitId1(receiptDetail.getUnitId1());
-        receiptDetail.setUnitId2(receiptDetail.getUnitId2());
-        receiptDetail.setUnitId1Qty(receiptDetail.getUnitId1Qty());
-        receiptDetail.setUnitId1Qty(receiptDetail.getUnitId2Qty());
-        receiptDetail.setMultiple(receiptDetail.getMultiple());
+//        receiptDetail.setUnitId1(receiptDetail.getUnitId1());
+//        receiptDetail.setUnitId2(receiptDetail.getUnitId2());
+//        receiptDetail.setUnitId1Qty(receiptDetail.getUnitId1Qty());
+//        receiptDetail.setUnitId1Qty(receiptDetail.getUnitId2Qty());
+//        receiptDetail.setMultiple(receiptDetail.getMultiple());
         receiptDetail.setCreatedBy(ShiroUtils.getLoginName());
         receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
         receiptDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        receiptDetail.setTotalWeight(receiptDetail.getTotalWeight());
-        receiptDetail.setVin(receiptDetail.getVin());
-        receiptDetail.setScrapTime(receiptDetail.getScrapTime());
-        //receiptDetail.setReceiptWeight(receiptDetail.getReceiptWeight());
-        receiptDetail.setElectricQuantity(receiptDetail.getElectricQuantity());
-        receiptDetail.setBatteryPackageWeight(receiptDetail.getBatteryPackageWeight());
-        //04-28
-        receiptDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
-        receiptDetail.setMaterialTareWeight(receiptDetail.getMaterialTareWeight());
-        receiptDetail.setMaterialGrossWeight(receiptDetail.getMaterialGrossWeight());
-//        receiptDetail.setBatteryPackageCode(receiptDetail.getBatteryPackageCode());
-        receiptDetail.setMaterialBatch(receiptDetail.getMaterialBatch());
+//        receiptDetail.setTotalWeight(receiptDetail.getTotalWeight());
+//        receiptDetail.setVin(receiptDetail.getVin());
+//        receiptDetail.setScrapTime(receiptDetail.getScrapTime());
+//        receiptDetail.setElectricQuantity(receiptDetail.getElectricQuantity());
+//        receiptDetail.setBatteryPackageWeight(receiptDetail.getBatteryPackageWeight());
+//        //04-28
+//        receiptDetail.setMaterialNetWeight(receiptDetail.getMaterialNetWeight());
+//        receiptDetail.setMaterialTareWeight(receiptDetail.getMaterialTareWeight());
+//        receiptDetail.setMaterialGrossWeight(receiptDetail.getMaterialGrossWeight());
+//        receiptDetail.setMaterialBatch(receiptDetail.getMaterialBatch());
         //根据流程配置更新入库明细下一流程
         ReceiptDetail receiptDetail1 = queryflow(receiptDetail);
         if (this.save(receiptDetail1)) {
-//            receiptHeader.setTotalQty(receiptHeader.getTotalQty().add(receiptDetail1.getTotalQty()));
-//            receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
-//            receiptHeaderService.updateById(receiptHeader);
             updateReceiptHeader(receiptHeader);
             return AjaxResult.success("新增单据明细成功");
         } else {
@@ -195,7 +175,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         }
     }
-
+    @Override
     public String findBatteryPackTwoCode(ReceiptDetail receiptDetail){
         String batteryPackTwoCode=null;
         if(receiptDetail.getMaterialIsBattery()==1){
@@ -399,6 +399,13 @@ public class ShipmentContainerDetail implements Serializable {
     @ApiModelProperty(value="是否电池，1电池，2非电池")
     private Integer materialIsBattery;
+    /**
+     * 电池包二维码
+     */
+    @TableField(value = "batteryPackTwoCode")
+    @ApiModelProperty(value="电池包二维码")
+    private String batteryPackTwoCode;
+
     private static final long serialVersionUID = 1L;
 }
@@ -183,14 +183,6 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         }else if(i < 0) {
             throw new ServiceException("出库数量不能大于单据数量！");
         }
-//        int u = shipmentDetail.getShipWeight().compareTo(shipmentDetail.getRequestWeight());
-//        if(u > 0){
-//            shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_WAVE);
-//        }else if(u == 0) {
-//            shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_GROUPDISK);
-//        }else if(u < 0) {
-//            throw new ServiceException("出库数量不能大于单据数量！");
-//        }
         shipmentDetailService.saveOrUpdate(shipmentDetail);
@@ -423,6 +415,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         shipmentContainerDetaill.setMaterialTareWeight(inventoryDetail.getMaterialTareWeight());
         shipmentContainerDetaill.setMaterialNetWeight(inventoryDetail.getMaterialNetWeight());
         shipmentContainerDetaill.setMaterialGrossWeight(inventoryDetail.getMaterialGrossWeight());
+        shipmentContainerDetaill.setBatteryPackTwoCode(inventoryDetail.getBatteryPackTwoCode());
         shipmentContainerDetaill.setQty(qty);
         shipmentContainerDetaill.setWeights(new BigDecimal(0));
         shipmentContainerDetaill.setElectricQuantity(shipmentCombinationModel.getElectricQuantity());
@@ -77,5 +77,6 @@
     inventorySts, taskCreated, convertedQty, convertedQtyUnit, created, createdBy, lastUpdated, 
     lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, 
     userDef7, userDef8, processStamp,materialNetWeight,materialTareWeight,materialGrossWeight
+    ,batteryQty,batteryPackType,batteryTypes,completeness,batteryPackTwoCode,materialIsBattery,recycler
   </sql>
 </mapper>
 \ No newline at end of file
@@ -82,6 +82,7 @@
     <result column="materialTareWeight" jdbcType="DECIMAL" property="materialTareWeight" />
     <result column="materialGrossWeight" jdbcType="DECIMAL" property="materialGrossWeight" />
     <result column="materialIsBattery" jdbcType="INTEGER" property="materialIsBattery" />
+    <result column="batteryPackTwoCode" jdbcType="VARCHAR" property="batteryPackTwoCode" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -96,7 +97,7 @@
     attribute4, batch, lot, projectNo, manufactureDate, expirationDate, agingDate, inventorySts, 
     packingClass, created, createdBy, lastUpdated, lastUpdatedBy,
     version, userDef1, userDef2, userDef3,
-    processStamp,materialNetWeight,materialTareWeight,materialGrossWeight
+    processStamp,materialNetWeight,materialTareWeight,materialGrossWeight,batteryPackTwoCode
   </sql>
   <select id="selectListMapByEqual" resultType="java.util.HashMap">
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<style>
+    .divstyle{
+        margin-top: 0px;
+    }
+    .spanstyle{
+        margin-left: 2%;
+    }
+    .dy-report{
+
+    }
+</style>
+<body class="white-bg" style="padding:5px 0;" id="ddd">
+<div class="container" style="color: #333;">
+    <div class="row">
+        <div class="row" style="text-align:right"><span class="hidden-print" style="padding-left:2px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span></div>
+        <table width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report "
+               th:each="row:${receiptDetails}">
+            <tbody>
+            <tr style="height:40%">
+                <td   style="margin:0px;width:100%;" align="center"  >
+                    <input th:value="${row.batteryPackTwoCode}"  type="hidden" name="code"/>
+                    <!--<div style="" class="qrcode"></div>-->
+                    <img   th:src="@{'/image/'+${row.batteryPackTwoCode}}">
+                </td>
+            </tr>
+            <tr style="">
+                <td  style="text-align:center">
+                    <div class="divstyle" >
+                        <span >PACK编码：</span>
+                        <span th:text="${row.batteryPackTwoCode}"></span></div>
+                    <div class="divstyle" >
+                        <span >PACK内部种类：</span>
+                        <span>电池包</span></div>
+                    <div class="divstyle" >
+                        <span >供货商：</span>
+                        <span th:text="${row.companyName}"></span></div>
+                    <div class="divstyle" >
+                        <span >打印时间：</span>
+                        <span th:text="${row.userDef1}"></span></div>
+                </td>
+            </tr>
+
+            </tbody>
+        </table>
+    </div>
+</div>
+<div th:include="include :: footer"></div>
+<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
+<script type="text/javascript" src="../../../js/qrcode/qrcode.min.js"></script>
+<script th:inline="javascript">
+    function print_qrcode(){
+        $('.dy-report').each(function (i,item) {
+            var code=$("input[name='code']")[i].value;
+            //var code=$("#code").val();
+            var code_text=code;
+            $(".qrcode")[i].innerHTML = "";
+            var QRcode=new QRCode($(this).find('.qrcode')[0],{
+                text:code_text,
+                width:100,
+                height:100,
+                correctLevel:QRCode.CorrectLevel.L
+            });
+        });
+    }
+   // print_qrcode();
+</script>
+<style type="text/css">
+    @media print {
+        .noprint{display:none;}
+    }
+</style>
+<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
+<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
+<script type="text/javascript">
+    function a(){
+        $("#ddd").jqprint();
+        /*$(".qrcode").children().remove();
+        print_qrcode();
+        window.print();*/
+    }
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -205,9 +205,9 @@
                         <a class="btn btn-outline btn-success btn-rounded" onclick="receiptDetailPrint()" shiro:hasPermission="shipment:bill:report">
                             <i class="fa fa-print"></i> 打印
                         </a>
-                        <a class="btn btn-outline btn-success btn-rounded" onclick="batteryPackagePrint()" shiro:hasPermission="shipment:bill:report">
+                        <!--<a class="btn btn-outline btn-success btn-rounded" onclick="batteryPackagePrint()" shiro:hasPermission="shipment:bill:report">
                             <i class="fa fa-print"></i> 电池包打印
-                        </a>
+                        </a>-->
                         <a class="btn btn-outline btn-success btn-rounded" onclick="bindCar()" >
                             <i class="fa fa-print"></i> 绑定车辆
                         </a>
@@ -160,7 +160,11 @@
 				<a class="btn btn-outline btn-primary btn-rounded" href="/wms/task/taskHeader?taskType=100">
 					<i class="fa fa-edit"></i> 跳转任务
 				</a>
+				<a class="btn btn-outline btn-primary btn-rounded" onclick="batteryPackagePrints()">
+					<i class="fa fa-edit"></i> 电池包打印
+				</a>
 			</div>
+
 			<table id="bootstrap-table1" data-mobile-responsive="true"
 				   class="table table-bordered table-hover text-nowrap"></table>
 			<ul class="select-list top_text">
@@ -225,7 +229,7 @@
 				code: code
 			},
 			error:function (response) {
-				console.log(response);
+				//console.log(response);
 			},
 			success: function (value) {
 				var qty_show=0;
@@ -302,6 +306,8 @@
 								created: value.data[i].created,
 								createdBy: value.data[i].createdBy,
 								electricQuantity: value.data[i].electricQuantity,
+								batteryPackTwoCode: value.data[i].batteryPackTwoCode,
+								materialIsBattery: value.data[i].materialIsBattery,
 								batteryPackageWeight: value.data[i].batteryPackageWeight
 							}
 						});
@@ -469,9 +475,29 @@
 				checkbox: true,
 			},
 			{
+				title: '操作',
+				align: 'center',
+				events:'operateEvents',
+				formatter: function(value, row, index) {
+					var actions = [];
+					if (row.status == 0) {
+						actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a>');
+					}
+					console.log(row )
+					if (row.batteryPackTwoCode !=''&&row.batteryPackTwoCode !=undefined) {
+						actions.push('<a class="btn btn-danger btn-xs" href="#" onclick="batteryPackagePrint(\'' + row.id + '\')"><i class="fa fa-edit"></i>打印</a>');
+					}
+					return actions.join('');
+				}
+			},
+			{
+				field : 'batteryPackTwoCode',
+				title : '电池包二维码'
+			},
+			/*{
 				field : 'locationCode',
 				title : '库位编号'
-			},
+			},*/
 			{
 				field : 'containerCode',
 				title : '容器编号'
@@ -544,18 +570,6 @@
 			{
 				field : 'createdBy',
 				title : '创建人'
-			},
-			{
-				title: '操作',
-				align: 'center',
-				events:'operateEvents',
-				formatter: function(value, row, index) {
-					var actions = [];
-					if (row.status == 0) {
-						actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a>');
-					}
-					return actions.join('');
-				}
 			}]
 	});
@@ -938,6 +952,24 @@
 		var url = ctx + "receipt/receiving/listBarCodeHeaderCode";
 		$.modal.open("选择主条码", url);
 	}
+	var detailPrefix = ctx + "receipt/receiptContainerDetail";
+	function batteryPackagePrint(id){
+		var url = detailPrefix + "/reportBatteryPackage/" + id;
+		$.modal.open("入库电池包打印" , url);
+	}
+	function batteryPackagePrints(){
+		var rows=$("#bootstrap-table1").bootstrapTable('getSelections');
+		if (rows.length == 0) {
+			$.modal.alertWarning("请至少选择一条记录");
+			return;
+		}
+		var ids = "";
+		for(var i=0; i<rows.length; i++) {
+			ids = ids + rows[i].id + ","
+		}
+		var url = detailPrefix + "/reportBatteryPackage/" + ids;
+		$.modal.open("入库电池包打印" , url);
+	}
 </script>
 </body>
 </html>