[ofbiz-framework] branch trunk updated: Improved: Picklist is in Input status even after order is completed (OFBIZ-10883)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6818aa1  Improved: Picklist is in Input status even after order is 
completed (OFBIZ-10883)
6818aa1 is described below

commit 6818aa1e5b5cb9e7a5728e1d97517921ffc5b000
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Dec 3 16:38:54 2021 +0100

    Improved: Picklist is in Input status even after order is completed 
(OFBIZ-10883)
    
    Just some formatting after fixing possible null dereferencings for 
OFBIZ-12386
    at a3a53b5b72397265ae4b9b37488d9175bcf3ef8b
---
 .../java/org/apache/ofbiz/shipment/packing/PackingSession.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
 
b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
index a7366ce..bd02eff 100644
--- 
a/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
+++ 
b/applications/product/src/main/java/org/apache/ofbiz/shipment/packing/PackingSession.java
@@ -1217,7 +1217,10 @@ public class PackingSession implements 
java.io.Serializable {
     protected void setPicklistToPicked() throws GeneralException {
         Delegator delegator = this.getDelegator();
         if (picklistBinId != null) {
-            GenericValue picklist = 
EntityQuery.use(delegator).from("PicklistAndBin").where("picklistBinId", 
picklistBinId).queryFirst();
+            GenericValue picklist = EntityQuery.use(delegator)
+                    .from("PicklistAndBin")
+                    .where("picklistBinId", picklistBinId)
+                    .queryFirst();
             if (picklist != null) {
                 if (!"PICKLIST_PICKED".equals(picklist.getString("statusId"))
                         && 
!"PICKLIST_COMPLETED".equals(picklist.getString("statusId"))
@@ -1230,7 +1233,10 @@ public class PackingSession implements 
java.io.Serializable {
                 }
             }
         } else {
-            List<GenericValue> picklistBins = 
EntityQuery.use(delegator).from("PicklistAndBin").where("primaryOrderId", 
primaryOrderId).queryList();
+            List<GenericValue> picklistBins = EntityQuery.use(delegator)
+                    .from("PicklistAndBin")
+                    .where("primaryOrderId", primaryOrderId)
+                    .queryList();
             if (UtilValidate.isNotEmpty(picklistBins)) {
                 for (GenericValue picklistBin : picklistBins) {
                     if 
(!"PICKLIST_PICKED".equals(picklistBin.getString("statusId"))