手持机查询发货单

zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductInvoiceController.java

@@ -117,8 +117,8 @@ public class ProductInvoiceController extends BaseController {
      * 查询发货单货品信息
      */
     @GetMapping("/saleStorageDetails")
-    public AjaxResult saleStorageDetails(@RequestParam("id") Long id) {
-        return success(productInvoiceService.saleStorageDetails(id));
+    public AjaxResult saleStorageDetails(@RequestParam("id") Long id,String type) {
+        return success(productInvoiceService.saleStorageDetails(id,type));
     }
 
     /**

zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductInvoiceService.java

@@ -77,7 +77,7 @@ public interface IProductInvoiceService {
      * @param id 通知单编号
      * @return
      */
-    ProductInvoiceVO saleStorageDetails(Long id);
+    ProductInvoiceVO saleStorageDetails(Long id,String type);
 
     /**
      * 查询产品发货单

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductInvoiceServiceImpl.java

@@ -193,7 +193,7 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService {
 
 
     @Override
-    public ProductInvoiceVO saleStorageDetails(Long id) {
+    public ProductInvoiceVO saleStorageDetails(Long id,String type) {
         ProductInvoiceVO vo = new ProductInvoiceVO();
         //查询发货通知单详情
         ProductInvoice productInvoice = productInvoiceMapper.selectProductInvoiceById(id);
@@ -214,7 +214,7 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService {
         for (ProductInvoiceVO.SaleProductInfo saleProductInfo : saleProductInfoList2) {
             for (ProductInvoiceVO.SaleProductInfo saleProductInfo1 : saleProductInfoList1) {
 //                if (saleProductInfo1.getProductId().equals(saleProductInfo.getProductId()) && saleProductInfo1.getProductColor().equals(saleProductInfo.getProductColor())) {
-                    if (saleProductInfo1.getProductId().equals(saleProductInfo.getProductId())) {
+                    if (saleProductInfo1.getProductId().equals(saleProductInfo.getProductId()) && type == null) {
                     saleProductInfoList.remove(saleProductInfo);
                 }
             }
@@ -230,7 +230,13 @@ public class ProductInvoiceServiceImpl implements IProductInvoiceService {
         //客户编号
         vo.setCustomerId(saleOrderMapper.selectCustomerIdBySaleNo(productInvoice.getSaleOrderNo()));
         saleProductInfoList1.sort(Comparator.comparing(ProductInvoiceVO.SaleProductInfo::getProductId).thenComparing(ProductInvoiceVO.SaleProductInfo::getProductColor));
-        vo.setSaleProductInfoList(saleProductInfoList1);
+
+
+        if(type == null || type == ""){
+            vo.setSaleProductInfoList(saleProductInfoList1);
+        }else{
+            vo.setSaleProductInfoList(saleProductInfoList);
+        }
         return vo;
     }
 

zkqy-framework/src/main/java/com/zkqy/framework/sso_oauth2/controller/ThirdPartLoginController.java

@@ -58,7 +58,7 @@ public class ThirdPartLoginController {
             map.put("redirect_uri", CALLBACK);
             map.put("code", code);
 //            map.put("client_id", "mestools");
-            map.put("client_id", "hmc");
+            map.put("client_id", "lth");
 //            if(name.equals("")&&name!=
 //            null){
 //                map.put("client_id", "mestools");