库存明细打印

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -110,7 +110,7 @@ public class BasicOrderPrintController {
                 for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) {
                     //查询产品表
                     UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk());
-                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(obj.getOrderIdFk());
+//                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(obj.getOrderIdFk());
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -133,19 +133,19 @@ public class BasicOrderPrintController {
                     bizData.put("manufactor", obj.getManufacturer());
                     bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
-                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
+//                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
-                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
+//                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
-                        String encode="";
+//                        String encode="";
-                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
+//                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
-                            encode+=respons.getInvoiceEncode()+",";
+//                            encode+=respons.getInvoiceEncode()+",";
-                        }
+//                        }
-                        encode = encode.substring(0,encode.length()-1);
+//                        encode = encode.substring(0,encode.length()-1);
-                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
+//                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
+//                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
-                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
+//                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
-
+//
-                    }
+//                    }
                     list.add(bizData);
                     i++;
                 }
@@ -172,7 +172,7 @@ public class BasicOrderPrintController {
                     }
                     //查询产品表
                     UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk());
-                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
+//                    List<IoOrderInvoiceResponse> ioOrderInvoiceResponses = ioOrderDetailBizService.selectByorderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
                     //组装数据
                     Map<String, Object> bizData = new HashMap<>();
                     bizData.put("index", i);
@@ -195,18 +195,18 @@ public class BasicOrderPrintController {
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
-                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
+//                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
-                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
+//                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
-                        String encode="";
+//                        String encode="";
-                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
+//                        for (IoOrderInvoiceResponse respons : ioOrderInvoiceResponses) {
-                            encode+=respons.getInvoiceEncode()+",";
+//                            encode+=respons.getInvoiceEncode()+",";
-                        }
+//                        }
-                        encode = encode.substring(0,encode.length()-1);
+//                        encode = encode.substring(0,encode.length()-1);
-                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
+//                        bizData.put("invoiceEncode", encode == null ? ' ' : encode);
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
+//                        String dateStr = sdf.format(ioOrderInvoiceResponses.get(0).getCreateTime());
-                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
+//                        bizData.put("createTime", dateStr == null ? ' ' : dateStr);
-                    }
+//                    }
                     list.add(bizData);
                     i++;
                 }

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -16,24 +16,26 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.system.CompanyEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
-import com.glxp.api.req.inout.CptTraceRequest;
+import com.glxp.api.entity.thrsys.ThrProductsEntity;
-import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.req.inout.*;
-import com.glxp.api.req.inout.FilterOrderRequest;
-import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
 import com.glxp.api.res.inout.CptTraceOrderResponse;
 import com.glxp.api.res.inout.CptTraceResultResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import com.glxp.api.service.system.CompanyService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
+import com.glxp.api.service.thrsys.ThrProductsService;
 import com.glxp.api.util.JasperUtils;
 import net.sf.jasperreports.engine.JRException;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,10 +48,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 单据扫码明细查询接口
@@ -72,6 +71,10 @@ public class IoOrderDetailResultController extends BaseController {
     private SystemPDFModuleService systemPDFModuleService;
     @Value("${file_path}")
     private String filePath;
+    @Resource
+    private ThrProductsService thrProductsService;
+    @Resource
+    private IoOrderInvoiceService ioOrderInvoiceService;
 
     /**
      * 查询单据扫码明细列表
@@ -202,8 +205,8 @@ public class IoOrderDetailResultController extends BaseController {
      */
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/resultDetail/filterOrderPrint")
-    public BaseResponse filterOrderPrint(@RequestBody  FilterOrderDetailResultRequest filterOrderDetailResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException {
+    public BaseResponse filterOrderPrint(@RequestBody FilterOrderDetailResultRequest filterOrderDetailResultRequest, HttpServletRequest request, HttpServletResponse response) throws JRException, IOException {
-        List<IoOrderDetailResultResponse> ioOrderDetailResultResponseList=new ArrayList<>();
+        List<IoOrderDetailResultResponse> ioOrderDetailResultResponseList = new ArrayList<>();
         SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderDetailResultRequest.getTemplateId());
         //打印单号标签
         Map<String, Object> data = new HashMap<>(1);
@@ -211,9 +214,10 @@ public class IoOrderDetailResultController extends BaseController {
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
 
         //按选入打印
-        if(filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size()>0){
+        if (filterOrderDetailResultRequest.getList() != null && filterOrderDetailResultRequest.getList().size() > 0) {
-            ioOrderDetailResultResponseList =filterOrderDetailResultRequest.getList();
+            ioOrderDetailResultResponseList = filterOrderDetailResultRequest.getList();
-        }else{
+        } else {
+
             //按查询打印
             FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
             filterOrderRequest.setVueType(filterOrderDetailResultRequest.getActionType());
@@ -222,6 +226,10 @@ public class IoOrderDetailResultController extends BaseController {
                 return ResultVOUtils.success("");
             }
             filterOrderDetailResultRequest.setActions(actions);
+            AuthAdmin authAdmin = customerService.getUserBean();
+            if (StrUtil.isBlank(filterOrderDetailResultRequest.getInvCode())) {
+                filterOrderDetailResultRequest.setInvCode(authAdmin.getLocInvCode());
+            }
             ioOrderDetailResultResponseList = orderDetailResultService.filterOrderList(filterOrderDetailResultRequest);
             for (IoOrderDetailResultResponse orderDetailResultResponse : ioOrderDetailResultResponseList) {
                 if (orderDetailResultResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
@@ -233,8 +241,27 @@ public class IoOrderDetailResultController extends BaseController {
                 }
             }
         }
-        int i=1;
+        int i = 1;
         for (IoOrderDetailResultResponse ioOrderDetailResultResponse : ioOrderDetailResultResponseList) {
+            //查询第三方产品产品类别
+            ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + "");
+            //查询发票信息
+            String dateStr="";
+            List<String> encodeList=new ArrayList<>();
+            IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest();
+            ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + "");
+            ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk());
+            ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo());
+            List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest);
+            for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
+                encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode());
+            }
+            String encode=String.join(",", encodeList);
+            if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime());
+            }
+
             //组装数据
             Map<String, Object> ioOrderDetailResultData = new HashMap<>();
             ioOrderDetailResultData.put("index", String.valueOf(i));
@@ -250,20 +277,25 @@ public class IoOrderDetailResultController extends BaseController {
             ioOrderDetailResultData.put("spec", ioOrderDetailResultResponse.getSpec() == null ? ' ' : ioOrderDetailResultResponse.getSpec());
             ioOrderDetailResultData.put("price", ioOrderDetailResultResponse.getPrice() == null ? ' ' : ioOrderDetailResultResponse.getPrice());
             ioOrderDetailResultData.put("count", ioOrderDetailResultResponse.getCount());
-            ioOrderDetailResultData.put("reCount",ioOrderDetailResultResponse.getReCount());
+            ioOrderDetailResultData.put("reCount", ioOrderDetailResultResponse.getReCount());
             ioOrderDetailResultData.put("inCount", ioOrderDetailResultResponse.getInCount());
             ioOrderDetailResultData.put("acceptCount", ioOrderDetailResultResponse.getAcceptCount());
             ioOrderDetailResultData.put("fromCorpName", ioOrderDetailResultResponse.getFromCorpName() == null ? ' ' : ioOrderDetailResultResponse.getFromCorpName());
             ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName());
             ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction());
             ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime()));
+            if(thrProductsEntity!=null){
+                ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb());
+            }
+            ioOrderDetailResultData.put("invoiceEncode", encode);
+            ioOrderDetailResultData.put("createTime", dateStr);
             list.add(ioOrderDetailResultData);
             i++;
         }
 
         data.put("data", list);
         String param = JSON.toJSONString(data);
-        JasperUtils.jasperReport(request, response, param, filePath+"pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf");
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/dao/thrsys/ThrProductsDao.java

@@ -46,4 +46,6 @@ public interface ThrProductsDao extends BaseMapperPlus<ThrProductsDao, ThrProduc
     ThrProductsEntity selectByCodeAndThird(@Param("code") String code, @Param("thirdSysFk") String thirdSysFk);
 
     boolean updateEntityById(ThrProductsEntity thrProductsEntity);
+
+    ThrProductsEntity filterThrProductsByMainId(@Param("relId") String relId);
 }

src/main/java/com/glxp/api/service/thrsys/ThrProductsService.java

@@ -8,6 +8,7 @@ import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.req.thrsys.PostThrProductsRequest;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
@@ -74,4 +75,6 @@ public interface ThrProductsService extends IService<ThrProductsEntity> {
      * @return
      */
     BaseResponse downloadByRequest(FilterThrProductsRequest filterThrProductsRequest);
+
+    ThrProductsEntity filterThrProductsByMainId(String relId);
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -268,6 +268,11 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
         return ResultVOUtils.success("下载成功");
     }
 
+    @Override
+    public ThrProductsEntity filterThrProductsByMainId(String relId) {
+        return thrProductsDao.filterThrProductsByMainId(relId);
+    }
+
     /**
      * 校验拉取的第三方数据是否有更新
      *

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -334,4 +334,18 @@
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
+
+    <select id="filterThrProductsByMainId" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
+        SELECT *
+        FROM thr_products
+        LEFT JOIN basic_udirel  ON thr_products.id = basic_udirel.mainId
+        <where>
+            <if test="relId != '' and relId != null">
+                AND basic_udirel.id  = #{relId}
+            </if>
+        </where>
+    </select>
+
+
+
 </mapper>